diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagedTest.java index 0294988ab3..3c6bbdb199 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_EntityGraph_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_EntityGraph_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_EntityGraph_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_EntityGraph_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_EntityGraph_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_EntityGraph_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_EntityGraph_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_EntityGraph_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/"); - if(earResURL != null) { - jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagednotxTest.java index 0d15799e5a..c0ff1478a0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_EntityGraph_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/"); - if(earResURL != null) { - jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPmservletTest.java index 63cacd3923..3332d047c4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_EntityGraph_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_EntityGraph = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/"); - if(earResURL != null) { - jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPuservletTest.java index 79dde8e0b2..b9275c2497 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_EntityGraph_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_EntityGraph = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/"); - if(earResURL != null) { - jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateful3Test.java index 6b0195675a..57fa83b6b0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_EntityGraph_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_EntityGraph_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_EntityGraph_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_EntityGraph_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_EntityGraph_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_EntityGraph_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_EntityGraph_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_EntityGraph_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/"); - if(earResURL != null) { - jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateless3Test.java index bf37b34fd0..fe379f8e97 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_EntityGraph_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_EntityGraph_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_EntityGraph_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_EntityGraph_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_EntityGraph_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_EntityGraph_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_EntityGraph_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_EntityGraph_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/"); - if(earResURL != null) { - jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagedTest.java index 5f8b7bc8d0..9d86bece25 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagedTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/"); - if(earResURL != null) { - jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagednotxTest.java index 5859b4dd3c..873f34cacd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagednotxTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/"); - if(earResURL != null) { - jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1PmservletTest.java index 1ef5f38388..a794e2f928 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class ); // The web.xml descriptor URL warResURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_StoredProcedureQuery_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_StoredProcedureQuery = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery.jar"); @@ -145,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/"); - if(earResURL != null) { - jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1PuservletTest.java index ef8621a95a..8432d406f7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class ); // The web.xml descriptor URL warResURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_StoredProcedureQuery_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_StoredProcedureQuery = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery.jar"); @@ -145,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/"); - if(earResURL != null) { - jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateful3Test.java index c9ad1c62f9..debf2da301 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateful3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/"); - if(earResURL != null) { - jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateless3Test.java index a0f1899ee5..f73b228561 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateless3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/"); - if(earResURL != null) { - jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2AppmanagedTest.java index 3058d337d9..5ebc844591 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2AppmanagedTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/"); - if(earResURL != null) { - jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2AppmanagednotxTest.java index 439b2720e7..663a329cb8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2AppmanagednotxTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/"); - if(earResURL != null) { - jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2PmservletTest.java index 21769c616c..aa7e65b2d1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class ); // The web.xml descriptor URL warResURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_StoredProcedureQuery_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_StoredProcedureQuery = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery.jar"); @@ -145,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/"); - if(earResURL != null) { - jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2PuservletTest.java index b3fa696541..a88f85e0b4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class ); // The web.xml descriptor URL warResURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_StoredProcedureQuery_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_StoredProcedureQuery = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery.jar"); @@ -145,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/"); - if(earResURL != null) { - jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2Stateful3Test.java index d42bb04ca5..0746f130bd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2Stateful3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/"); - if(earResURL != null) { - jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2Stateless3Test.java index 36a4850f5d..0181a9e5ba 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2Stateless3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/"); - if(earResURL != null) { - jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 24eb9e1ce2..a9fb8c028c 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 483d39b67a..1a908b5b11 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1PmservletTest.java index b8b0b9766c..062d849989 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The web.xml descriptor URL warResURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_access_field_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar"); @@ -145,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1PuservletTest.java index 7e139139bb..34fb7dec96 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The web.xml descriptor URL warResURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_access_field_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar"); @@ -145,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 b038429f0d..13bfbe5d65 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 24bf6203c8..6ee0e6ec99 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 cd7df75448..c6a3ffed3c 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 d148dc3e4c..5e8633fc68 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2PmservletTest.java index 163dc6f8e1..4423e8725c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The web.xml descriptor URL warResURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_access_field_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar"); @@ -145,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2PuservletTest.java index a64e831f5c..6b9d12d144 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The web.xml descriptor URL warResURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_access_field_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar"); @@ -145,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 f613c0e9f4..e5f5e0d1d8 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 f708d11273..0f1f8d8e13 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 7c1ef1e029..a164762b7e 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The application-client.xml descriptor URL resURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_appmanaged_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_appmanaged_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_appmanaged_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 657c14cf3c..f8585a76a1 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The application-client.xml descriptor URL resURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3PmservletTest.java index 9e12fc7ec8..186647ee1f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The web.xml descriptor URL warResURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_access_field_pmservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar"); @@ -145,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3PuservletTest.java index 22c2196ff6..616e051a48 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The web.xml descriptor URL warResURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_access_field_puservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar"); @@ -145,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 eaa12c33de..d98e149bc2 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The application-client.xml descriptor URL resURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_stateful3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_stateful3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_stateful3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 b06cf155c7..7d5bb18371 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The application-client.xml descriptor URL resURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_stateless3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_stateless3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_stateless3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 e39974fbdc..4c33c31825 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The application-client.xml descriptor URL resURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_appmanaged_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - ee.jakarta.tck.persistence.core.annotations.access.field.Client4.class + ee.jakarta.tck.persistence.core.annotations.access.field.Client4.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_appmanaged_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_appmanaged_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 5f1637923e..11e7891ec8 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The application-client.xml descriptor URL resURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, - ee.jakarta.tck.persistence.core.annotations.access.field.Client4.class + ee.jakarta.tck.persistence.core.annotations.access.field.Client4.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4PmservletTest.java index a4b7a6d422..aee1a1c264 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - ee.jakarta.tck.persistence.core.annotations.access.field.Client4.class + ee.jakarta.tck.persistence.core.annotations.access.field.Client4.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The web.xml descriptor URL warResURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_access_field_pmservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar"); @@ -145,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4PuservletTest.java index 1b6c380373..ce0b4b0ee4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - ee.jakarta.tck.persistence.core.annotations.access.field.Client4.class + ee.jakarta.tck.persistence.core.annotations.access.field.Client4.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The web.xml descriptor URL warResURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_access_field_puservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar"); @@ -145,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 4eb8a667be..bda5c40bc0 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The application-client.xml descriptor URL resURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_stateful3_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - ee.jakarta.tck.persistence.core.annotations.access.field.Client4.class + ee.jakarta.tck.persistence.core.annotations.access.field.Client4.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_stateful3_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_stateful3_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 0454788693..f8fdf7c375 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The application-client.xml descriptor URL resURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_stateless3_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - ee.jakarta.tck.persistence.core.annotations.access.field.Client4.class + ee.jakarta.tck.persistence.core.annotations.access.field.Client4.class, + ee.jakarta.tck.persistence.core.annotations.access.field.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_field_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_field_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_stateless3_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_field_stateless3_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/"); - if(earResURL != null) { - jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/field/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 d3187e991a..7372bec3b2 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 @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_anno_access_mappedsc_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/mappedsc/"); - if(earResURL != null) { - jpa_core_anno_access_mappedsc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/mappedsc/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_anno_access_mappedsc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 e293adb45d..ed3dc3b3a1 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 @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/mappedsc/"); - if(earResURL != null) { - jpa_core_anno_access_mappedsc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/mappedsc/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_anno_access_mappedsc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientPmservletTest.java index 3ab9db9d6f..c165d176d6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_anno_access_mappedsc_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_anno_access_mappedsc = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc.jar"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/mappedsc/"); - if(earResURL != null) { - jpa_core_anno_access_mappedsc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/mappedsc/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_anno_access_mappedsc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientPuservletTest.java index 78377f51df..b62d3479a8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_anno_access_mappedsc_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_anno_access_mappedsc = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc.jar"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/mappedsc/"); - if(earResURL != null) { - jpa_core_anno_access_mappedsc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/mappedsc/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_anno_access_mappedsc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 dc1f32360c..248937fca0 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 @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_anno_access_mappedsc_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/mappedsc/"); - if(earResURL != null) { - jpa_core_anno_access_mappedsc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/mappedsc/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_anno_access_mappedsc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 8a99ec9a26..09b3f07bb8 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 @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_anno_access_mappedsc_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/mappedsc/"); - if(earResURL != null) { - jpa_core_anno_access_mappedsc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/mappedsc/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_anno_access_mappedsc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 d97e4e9b8e..84ed577dff 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.property.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_property_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_property_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.property.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_property_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_property_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_property_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_property_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_property_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_property_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/"); - if(earResURL != null) { - jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 4503ede4a8..bcb709916b 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.property.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.annotations.access.property.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/"); - if(earResURL != null) { - jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1PmservletTest.java index 557810e4d4..f0878b795c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.property.Client.class ); // The web.xml descriptor URL warResURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_access_property_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_access_property = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property.jar"); @@ -145,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/"); - if(earResURL != null) { - jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1PuservletTest.java index d5710d1d39..621b53c491 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.property.Client.class ); // The web.xml descriptor URL warResURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_access_property_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_access_property = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property.jar"); @@ -145,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/"); - if(earResURL != null) { - jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 adfb5170be..a7ed7bbf2b 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.property.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_property_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_property_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.property.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_property_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_property_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_property_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_property_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_property_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_property_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/"); - if(earResURL != null) { - jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 30df349dc2..df8889cb54 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.property.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_property_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_property_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.property.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_property_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_property_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_property_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_property_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_property_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_property_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/"); - if(earResURL != null) { - jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 0d3b6927c6..9e08bcd749 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.property.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_property_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_property_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.property.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_property_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_property_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_property_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_property_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_property_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_property_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/"); - if(earResURL != null) { - jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 0fa5d0ee30..9370edc63d 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.property.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.annotations.access.property.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/"); - if(earResURL != null) { - jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2PmservletTest.java index d715fb3441..84d26c1ebc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.property.Client.class ); // The web.xml descriptor URL warResURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_access_property_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_access_property = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property.jar"); @@ -145,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/"); - if(earResURL != null) { - jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2PuservletTest.java index c742a017a6..2b343c02ca 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.property.Client.class ); // The web.xml descriptor URL warResURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_access_property_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_access_property = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property.jar"); @@ -145,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/"); - if(earResURL != null) { - jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 e5c232b8a8..7427a6444c 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.property.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_property_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_property_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.property.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_property_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_property_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_property_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_property_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_property_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_property_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/"); - if(earResURL != null) { - jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 beabbec8c5..995de4827b 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.property.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_property_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_access_property_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.access.property.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_property_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_property_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_access_property_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_access_property_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_access_property_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_access_property_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/"); - if(earResURL != null) { - jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/access/property/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_access_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 bbf7cc46a9..d9e1af8be7 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 @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_assocoverride_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/assocoverride/"); - if(earResURL != null) { - jpa_core_annotations_assocoverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/assocoverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_assocoverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 68596cf4c0..6001fad799 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 @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/assocoverride/"); - if(earResURL != null) { - jpa_core_annotations_assocoverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/assocoverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_assocoverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientPmservletTest.java index 7edc8e942c..7700cd6222 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_assocoverride_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_assocoverride = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/assocoverride/"); - if(earResURL != null) { - jpa_core_annotations_assocoverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/assocoverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_assocoverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientPuservletTest.java index b324f554eb..f7aeba85cc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_assocoverride_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_assocoverride = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/assocoverride/"); - if(earResURL != null) { - jpa_core_annotations_assocoverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/assocoverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_assocoverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 a88d8606f2..c041a86c6a 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 @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_assocoverride_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_assocoverride_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_assocoverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_assocoverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_assocoverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_assocoverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_assocoverride_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_assocoverride_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/assocoverride/"); - if(earResURL != null) { - jpa_core_annotations_assocoverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/assocoverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_assocoverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 e2842e63c4..6561ffc6ce 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 @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_assocoverride_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_assocoverride_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_assocoverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_assocoverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_assocoverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_assocoverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_assocoverride_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_assocoverride_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/assocoverride/"); - if(earResURL != null) { - jpa_core_annotations_assocoverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/assocoverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_assocoverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 1cd8f3d98a..8396a304e6 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.basic.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.basic.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_basic_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_basic_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/"); - if(earResURL != null) { - jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 033e0e42fe..8ce72cf352 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.basic.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.annotations.basic.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/"); - if(earResURL != null) { - jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1PmservletTest.java index 00a97bf743..27a5af1bbd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.basic.Client.class ); // The web.xml descriptor URL warResURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_basic_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_basic = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic.jar"); @@ -143,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/"); - if(earResURL != null) { - jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1PuservletTest.java index 0148811431..c951455e3f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.basic.Client.class ); // The web.xml descriptor URL warResURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_basic_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_basic = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic.jar"); @@ -143,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/"); - if(earResURL != null) { - jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 29a45864e6..2df468210e 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.basic.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_basic_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.basic.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_basic_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_basic_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/"); - if(earResURL != null) { - jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 49a19128d5..1318377531 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.basic.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_basic_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.basic.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_basic_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_basic_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/"); - if(earResURL != null) { - jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 ae8dd7a97f..f22a7d87b4 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.basic.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.basic.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_basic_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_basic_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/"); - if(earResURL != null) { - jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 b051b7480e..ea6113eadf 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.basic.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.annotations.basic.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/"); - if(earResURL != null) { - jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2PmservletTest.java index 55f30351f9..ee7f9fb772 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.basic.Client.class ); // The web.xml descriptor URL warResURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_basic_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_basic = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic.jar"); @@ -143,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/"); - if(earResURL != null) { - jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2PuservletTest.java index 2489b6f7bb..0dcabe486f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.basic.Client.class ); // The web.xml descriptor URL warResURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_basic_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_basic = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic.jar"); @@ -143,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/"); - if(earResURL != null) { - jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 4c61a5901b..0b1659a47c 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.basic.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_basic_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.basic.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_basic_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_basic_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/"); - if(earResURL != null) { - jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 d18854a08d..7aedf4e681 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 @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.basic.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_basic_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.basic.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_basic_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_basic_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/"); - if(earResURL != null) { - jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/basic/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 4c148a6092..851e85817f 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 @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_collectiontable_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/collectiontable/"); - if(earResURL != null) { - jpa_core_annotations_collectiontable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/collectiontable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_collectiontable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 607ff6f672..e574f185ac 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 @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/collectiontable/"); - if(earResURL != null) { - jpa_core_annotations_collectiontable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/collectiontable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_collectiontable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientPmservletTest.java index 2e2505cda6..8435df7dfb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_collectiontable_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_collectiontable = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/collectiontable/"); - if(earResURL != null) { - jpa_core_annotations_collectiontable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/collectiontable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_collectiontable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientPuservletTest.java index 9426a5edcf..b1e51e5742 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_collectiontable_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_collectiontable = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/collectiontable/"); - if(earResURL != null) { - jpa_core_annotations_collectiontable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/collectiontable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_collectiontable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 86d5b50c3c..2928ac0043 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 @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_collectiontable_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_collectiontable_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_collectiontable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_collectiontable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_collectiontable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_collectiontable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_collectiontable_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_collectiontable_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/collectiontable/"); - if(earResURL != null) { - jpa_core_annotations_collectiontable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/collectiontable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_collectiontable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 dad14c9d17..e2de558f82 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 @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_collectiontable_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_collectiontable_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_collectiontable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_collectiontable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_collectiontable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_collectiontable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_collectiontable_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_collectiontable_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/collectiontable/"); - if(earResURL != null) { - jpa_core_annotations_collectiontable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/collectiontable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_collectiontable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 b0772a2a05..fa98a2c1b0 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 @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_convert_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_convert_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_convert_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_convert_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_convert_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_convert_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_convert_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_convert_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -188,12 +189,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/convert/"); - if(earResURL != null) { - jpa_core_convert_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/convert/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_convert_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 c99d0cc06e..f3f672e906 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 @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_convert_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_convert_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_convert_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_convert_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_convert_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_convert_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_convert_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_convert_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -188,12 +189,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/convert/"); - if(earResURL != null) { - jpa_core_convert_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/convert/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_convert_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientPmservletTest.java index 8ca505800a..8d3ec17c06 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_convert_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_convert = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert.jar"); @@ -161,12 +162,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/convert/"); - if(earResURL != null) { - jpa_core_convert_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/convert/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_convert_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientPuservletTest.java index 0efc2af753..b5ff52aa25 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_convert_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_convert = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert.jar"); @@ -161,12 +162,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/convert/"); - if(earResURL != null) { - jpa_core_convert_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/convert/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_convert_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 e2e3733a93..c4d9265d39 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 @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_convert_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_convert_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_convert_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_convert_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_convert_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_convert_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_convert_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_convert_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -188,12 +189,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/convert/"); - if(earResURL != null) { - jpa_core_convert_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/convert/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_convert_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } 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 0e9e64076f..d37417d498 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 @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_convert_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_convert_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_convert_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_convert_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_convert_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_convert_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_convert_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_convert_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -188,12 +189,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/convert/"); - if(earResURL != null) { - jpa_core_convert_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/convert/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_convert_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientAppmanagedTest.java index 539444ac75..f8c45a9c6d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -174,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/discriminatorValue/"); - if(earResURL != null) { - jpa_core_annotations_discrinimatorValue_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/discriminatorValue/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_discrinimatorValue_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientAppmanagednotxTest.java index e8f5e3055a..f18fba2b23 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -174,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/discriminatorValue/"); - if(earResURL != null) { - jpa_core_annotations_discrinimatorValue_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/discriminatorValue/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_discrinimatorValue_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientPmservletTest.java index 2b728e944f..dfc11de51a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_discrinimatorValue = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue.jar"); @@ -147,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/discriminatorValue/"); - if(earResURL != null) { - jpa_core_annotations_discrinimatorValue_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/discriminatorValue/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_discrinimatorValue_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientPuservletTest.java index 07f58aef6d..42a4c662e3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_discrinimatorValue = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue.jar"); @@ -147,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/discriminatorValue/"); - if(earResURL != null) { - jpa_core_annotations_discrinimatorValue_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/discriminatorValue/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_discrinimatorValue_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientStateful3Test.java index 76e5037612..66d90ae017 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -174,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/discriminatorValue/"); - if(earResURL != null) { - jpa_core_annotations_discrinimatorValue_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/discriminatorValue/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_discrinimatorValue_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientStateless3Test.java index 970147c014..34e3a1d45e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -174,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/discriminatorValue/"); - if(earResURL != null) { - jpa_core_annotations_discrinimatorValue_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/discriminatorValue/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_discrinimatorValue_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1AppmanagedTest.java index c49617d8ef..fae78fec07 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1AppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_elementcollection_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/"); - if(earResURL != null) { - jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1AppmanagednotxTest.java index 53c49a8288..6a331448cf 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1AppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/"); - if(earResURL != null) { - jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1PmservletTest.java index e96c4c22ba..60dd249a63 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1PmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_elementcollection_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_elementcollection = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/"); - if(earResURL != null) { - jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1PuservletTest.java index 8800b5c757..b5259867cf 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1PuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_elementcollection_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_elementcollection = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/"); - if(earResURL != null) { - jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1Stateful3Test.java index 877349fe82..cf68d8d516 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1Stateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_elementcollection_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_elementcollection_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_elementcollection_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_elementcollection_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_elementcollection_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_elementcollection_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_elementcollection_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_elementcollection_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/"); - if(earResURL != null) { - jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1Stateless3Test.java index 861f0faaca..dae3be88dd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1Stateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_elementcollection_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_elementcollection_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_elementcollection_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_elementcollection_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_elementcollection_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_elementcollection_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_elementcollection_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_elementcollection_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/"); - if(earResURL != null) { - jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2AppmanagedTest.java index c4b8a306fa..c83b26469b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2AppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_elementcollection_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/"); - if(earResURL != null) { - jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2AppmanagednotxTest.java index 75ad64bc63..b9d279875e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2AppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/"); - if(earResURL != null) { - jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2PmservletTest.java index 54d6865881..28a825b81a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2PmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_elementcollection_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_elementcollection = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/"); - if(earResURL != null) { - jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2PuservletTest.java index f739f5ed51..429e2369c4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2PuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_elementcollection_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_elementcollection = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/"); - if(earResURL != null) { - jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2Stateful3Test.java index cebdaf0c3e..797e1550b0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2Stateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_elementcollection_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_elementcollection_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_elementcollection_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_elementcollection_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_elementcollection_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_elementcollection_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_elementcollection_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_elementcollection_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/"); - if(earResURL != null) { - jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2Stateless3Test.java index 16eaf46680..4844d5056e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2Stateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_elementcollection_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_elementcollection_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_elementcollection_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_elementcollection_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_elementcollection_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_elementcollection_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_elementcollection_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_elementcollection_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/"); - if(earResURL != null) { - jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/elementcollection/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_elementcollection_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientAppmanagedTest.java index 48b27b8095..fa0a5da2ea 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientAppmanagedTest.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_embeddable_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_embeddable_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_appmanaged_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_embeddable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_embeddable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_embeddable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_embeddable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_embeddable_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_embeddable_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -184,12 +185,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddable/"); - if(earResURL != null) { - jpa_core_annotations_embeddable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_embeddable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientAppmanagednotxTest.java index acd810ac9d..53083d9458 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientAppmanagednotxTest.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -184,12 +185,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddable/"); - if(earResURL != null) { - jpa_core_annotations_embeddable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_embeddable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientPmservletTest.java index 7416aa5df4..ad038c63c2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientPmservletTest.java @@ -122,6 +122,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_embeddable_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_embeddable = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable.jar"); @@ -157,12 +158,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddable/"); - if(earResURL != null) { - jpa_core_annotations_embeddable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_embeddable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientPuservletTest.java index 8666ab7100..008546cff5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientPuservletTest.java @@ -122,6 +122,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_embeddable_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_embeddable = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable.jar"); @@ -157,12 +158,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddable/"); - if(earResURL != null) { - jpa_core_annotations_embeddable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_embeddable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientStateful3Test.java index e4906e4955..bc6164cc86 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientStateful3Test.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_embeddable_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_embeddable_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_stateful3_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_embeddable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_embeddable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_embeddable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_embeddable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_embeddable_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_embeddable_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -184,12 +185,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddable/"); - if(earResURL != null) { - jpa_core_annotations_embeddable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_embeddable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientStateless3Test.java index fbd5e8d444..7a9fd16faa 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientStateless3Test.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_embeddable_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_embeddable_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_stateless3_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_embeddable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_embeddable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_embeddable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_embeddable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_embeddable_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_embeddable_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -184,12 +185,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddable/"); - if(earResURL != null) { - jpa_core_annotations_embeddable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_embeddable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientAppmanagedTest.java index e5e9728496..c2625a0365 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddableMapValue/"); - if(earResURL != null) { - jpa_core_annotations_embeddableMapValue_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddableMapValue/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_embeddableMapValue_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientAppmanagednotxTest.java index 0e935735fe..59e31dabc2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddableMapValue/"); - if(earResURL != null) { - jpa_core_annotations_embeddableMapValue_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddableMapValue/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_embeddableMapValue_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientPmservletTest.java index d0666ef925..26d6d85a21 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_embeddableMapValue = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddableMapValue/"); - if(earResURL != null) { - jpa_core_annotations_embeddableMapValue_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddableMapValue/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_embeddableMapValue_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientPuservletTest.java index 63995dd786..fa26a3a19c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_embeddableMapValue = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddableMapValue/"); - if(earResURL != null) { - jpa_core_annotations_embeddableMapValue_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddableMapValue/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_embeddableMapValue_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientStateful3Test.java index c8f560a263..545b275fc9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddableMapValue/"); - if(earResURL != null) { - jpa_core_annotations_embeddableMapValue_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddableMapValue/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_embeddableMapValue_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientStateless3Test.java index e67fb2887a..97a258d4d8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddableMapValue/"); - if(earResURL != null) { - jpa_core_annotations_embeddableMapValue_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/embeddableMapValue/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_embeddableMapValue_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientAppmanagedTest.java index 3edff12a2c..f759a15fff 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_entity_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_entity_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_entity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_entity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_entity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_entity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_entity_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_entity_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/entity/"); - if(earResURL != null) { - jpa_core_annotations_entity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/entity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_entity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientAppmanagednotxTest.java index f289ef073a..588c2c504c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_entity_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/entity/"); - if(earResURL != null) { - jpa_core_annotations_entity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/entity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_entity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientPmservletTest.java index 3db90deb32..89f0ced4be 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_entity_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_entity = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/entity/"); - if(earResURL != null) { - jpa_core_annotations_entity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/entity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_entity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientPuservletTest.java index 559ef77517..85c6bf3378 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_entity_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_entity = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/entity/"); - if(earResURL != null) { - jpa_core_annotations_entity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/entity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_entity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientStateful3Test.java index 9ca504a006..00525474db 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_entity_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_entity_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_entity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_entity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_entity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_entity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_entity_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_entity_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/entity/"); - if(earResURL != null) { - jpa_core_annotations_entity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/entity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_entity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientStateless3Test.java index df1e1f1f04..a4feceaf79 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_entity_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_entity_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_entity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_entity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_entity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_entity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_entity_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_entity_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/entity/"); - if(earResURL != null) { - jpa_core_annotations_entity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/entity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_entity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientAppmanagedTest.java index a95a935a77..b0ea414415 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_basic_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_basic_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +184,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/id/"); - if(earResURL != null) { - jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/id/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientAppmanagednotxTest.java index 717b02e71a..1c369cc30c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +184,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/id/"); - if(earResURL != null) { - jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/id/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientPmservletTest.java index ff6bbb0a80..0582441638 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_basic_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_basic = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic.jar"); @@ -156,12 +157,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/id/"); - if(earResURL != null) { - jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/id/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientPuservletTest.java index e04596e8c6..0f26000732 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_basic_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_basic = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic.jar"); @@ -156,12 +157,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/id/"); - if(earResURL != null) { - jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/id/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientStateful3Test.java index bb0c459a62..62fab0e23f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_basic_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_basic_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_basic_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +184,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/id/"); - if(earResURL != null) { - jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/id/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientStateless3Test.java index 9f0920fe62..11258ef6f6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_basic_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_basic_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_basic_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +184,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/id/"); - if(earResURL != null) { - jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/id/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientAppmanagedTest.java index 9e5ac249f8..d581e1db7e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_lob_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_lob_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_lob_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_lob_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_lob_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_lob_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_lob_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_lob_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/lob/"); - if(earResURL != null) { - jpa_core_annotations_lob_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/lob/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_lob_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientAppmanagednotxTest.java index 7d63483741..980899dfd7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_lob_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/lob/"); - if(earResURL != null) { - jpa_core_annotations_lob_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/lob/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_lob_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientPmservletTest.java index 669a3bd16c..0637535d59 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_lob_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_lob = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/lob/"); - if(earResURL != null) { - jpa_core_annotations_lob_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/lob/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_lob_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientPuservletTest.java index 825edd267b..0196d63b9a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_lob_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_lob = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/lob/"); - if(earResURL != null) { - jpa_core_annotations_lob_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/lob/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_lob_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientStateful3Test.java index 94b9ab2801..584c471871 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_lob_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_lob_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_lob_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_lob_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_lob_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_lob_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_lob_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_lob_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/lob/"); - if(earResURL != null) { - jpa_core_annotations_lob_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/lob/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_lob_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientStateless3Test.java index c57b9dbf26..2e02fedc10 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_lob_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_lob_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_lob_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_lob_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_lob_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_lob_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_lob_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_lob_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/lob/"); - if(earResURL != null) { - jpa_core_annotations_lob_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/lob/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_lob_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1AppmanagedTest.java index 8e87533553..b47503c4c0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1AppmanagedTest.java @@ -131,7 +131,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -147,7 +148,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkey_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkey_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanaged_vehicle_ejb.jar"); // The class files @@ -169,20 +170,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkey_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkey_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkey_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkey_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkey_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkey_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -222,12 +225,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/"); - if(earResURL != null) { - jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1AppmanagednotxTest.java index ebe4bb5629..3a1746d5f6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1AppmanagednotxTest.java @@ -131,7 +131,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -147,7 +148,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -169,20 +170,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -222,12 +225,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/"); - if(earResURL != null) { - jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1PmservletTest.java index ebc8aeb027..62dbb5756d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1PmservletTest.java @@ -130,7 +130,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class ); // The web.xml descriptor URL warResURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -158,6 +159,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_mapkey_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkey = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey.jar"); @@ -195,12 +197,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/"); - if(earResURL != null) { - jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1PuservletTest.java index 8713dbef23..b40b24819e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1PuservletTest.java @@ -130,7 +130,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class ); // The web.xml descriptor URL warResURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -158,6 +159,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_mapkey_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkey = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey.jar"); @@ -195,12 +197,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/"); - if(earResURL != null) { - jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1Stateful3Test.java index d76f04c554..62a6ac0706 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1Stateful3Test.java @@ -131,7 +131,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -147,7 +148,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkey_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkey_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateful3_vehicle_ejb.jar"); // The class files @@ -169,20 +170,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkey_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkey_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkey_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkey_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkey_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkey_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -222,12 +225,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/"); - if(earResURL != null) { - jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1Stateless3Test.java index 619ed7b43d..03729eec33 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1Stateless3Test.java @@ -131,7 +131,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -147,7 +148,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkey_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkey_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateless3_vehicle_ejb.jar"); // The class files @@ -169,20 +170,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkey_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkey_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkey_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkey_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkey_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkey_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -222,12 +225,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/"); - if(earResURL != null) { - jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2AppmanagedTest.java index 6e428d46b5..f46749e830 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2AppmanagedTest.java @@ -131,7 +131,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -147,7 +148,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkey_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkey_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanaged_vehicle_ejb.jar"); // The class files @@ -169,20 +170,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkey_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkey_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkey_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkey_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkey_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkey_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -222,12 +225,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/"); - if(earResURL != null) { - jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2AppmanagednotxTest.java index daede4f5aa..158bf8b020 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2AppmanagednotxTest.java @@ -131,7 +131,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -147,7 +148,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -169,20 +170,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -222,12 +225,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/"); - if(earResURL != null) { - jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2PmservletTest.java index 5e4f372e6a..c1e0359680 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2PmservletTest.java @@ -130,7 +130,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class ); // The web.xml descriptor URL warResURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -158,6 +159,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_mapkey_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkey = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey.jar"); @@ -195,12 +197,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/"); - if(earResURL != null) { - jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2PuservletTest.java index 849ff79a67..2cdb981221 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2PuservletTest.java @@ -130,7 +130,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class ); // The web.xml descriptor URL warResURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -158,6 +159,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_mapkey_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkey = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey.jar"); @@ -195,12 +197,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/"); - if(earResURL != null) { - jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2Stateful3Test.java index 5536c50677..a9599d1080 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2Stateful3Test.java @@ -131,7 +131,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -147,7 +148,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkey_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkey_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateful3_vehicle_ejb.jar"); // The class files @@ -169,20 +170,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkey_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkey_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkey_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkey_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkey_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkey_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -222,12 +225,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/"); - if(earResURL != null) { - jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2Stateless3Test.java index 459ae7553e..be6aba4e2e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2Stateless3Test.java @@ -131,7 +131,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -147,7 +148,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkey_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkey_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateless3_vehicle_ejb.jar"); // The class files @@ -169,20 +170,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkey_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkey_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkey_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkey_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkey_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkey_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -222,12 +225,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/"); - if(earResURL != null) { - jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkey/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkey_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientAppmanagedTest.java index 4b175fb133..da06bc7b36 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyclass/"); - if(earResURL != null) { - jpa_core_annotations_mapkeyclass_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyclass/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeyclass_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientAppmanagednotxTest.java index 4d242b35f8..398f4be8bc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyclass/"); - if(earResURL != null) { - jpa_core_annotations_mapkeyclass_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyclass/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeyclass_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientPmservletTest.java index b18609082d..bf8fe1fc08 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeyclass = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyclass/"); - if(earResURL != null) { - jpa_core_annotations_mapkeyclass_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyclass/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeyclass_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientPuservletTest.java index dc0c2780c3..048e471453 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_mapkeyclass_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeyclass = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyclass/"); - if(earResURL != null) { - jpa_core_annotations_mapkeyclass_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyclass/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeyclass_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientStateful3Test.java index f45892526b..4979ff8360 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyclass_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeyclass_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyclass_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyclass_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyclass_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyclass_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyclass_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyclass_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyclass/"); - if(earResURL != null) { - jpa_core_annotations_mapkeyclass_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyclass/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeyclass_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientStateless3Test.java index b100ab5f07..766a63ed9f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyclass_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeyclass_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyclass_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyclass_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyclass_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyclass_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyclass_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyclass_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyclass/"); - if(earResURL != null) { - jpa_core_annotations_mapkeyclass_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyclass/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeyclass_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientAppmanagedTest.java index 55108423cc..4e94b0aa0c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeycolumn/"); - if(earResURL != null) { - jpa_core_annotations_mapkeycolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeycolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeycolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientAppmanagednotxTest.java index 3eda15ac07..24cd952942 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeycolumn/"); - if(earResURL != null) { - jpa_core_annotations_mapkeycolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeycolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeycolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientPmservletTest.java index 87eb2377f8..774a451575 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_mapkeycolumn_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeycolumn = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeycolumn/"); - if(earResURL != null) { - jpa_core_annotations_mapkeycolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeycolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeycolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientPuservletTest.java index 8d2c2c318f..7640238f90 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_mapkeycolumn_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeycolumn = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeycolumn/"); - if(earResURL != null) { - jpa_core_annotations_mapkeycolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeycolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeycolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientStateful3Test.java index 0bd4715664..0fd32ddbbd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeycolumn_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeycolumn_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeycolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeycolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeycolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeycolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeycolumn_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeycolumn_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeycolumn/"); - if(earResURL != null) { - jpa_core_annotations_mapkeycolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeycolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeycolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientStateless3Test.java index 455968c335..ce34621ff2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeycolumn_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeycolumn_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeycolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeycolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeycolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeycolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeycolumn_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeycolumn_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeycolumn/"); - if(earResURL != null) { - jpa_core_annotations_mapkeycolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeycolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeycolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientAppmanagedTest.java index e35bac37a4..52661c5b5e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -180,12 +181,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyenumerated/"); - if(earResURL != null) { - jpa_core_annotations_mapkeyenumerated_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyenumerated/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeyenumerated_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientAppmanagednotxTest.java index a3057718eb..d34b5d8209 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -180,12 +181,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyenumerated/"); - if(earResURL != null) { - jpa_core_annotations_mapkeyenumerated_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyenumerated/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeyenumerated_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientPmservletTest.java index 47e7051e76..11f9d2cf2e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_mapkeyenumerated_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeyenumerated = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated.jar"); @@ -153,12 +154,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyenumerated/"); - if(earResURL != null) { - jpa_core_annotations_mapkeyenumerated_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyenumerated/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeyenumerated_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientPuservletTest.java index 39750f851d..fc408cb95b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_mapkeyenumerated_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeyenumerated = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated.jar"); @@ -153,12 +154,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyenumerated/"); - if(earResURL != null) { - jpa_core_annotations_mapkeyenumerated_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyenumerated/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeyenumerated_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientStateful3Test.java index 8a33594d72..41e4eeb8dd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -180,12 +181,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyenumerated/"); - if(earResURL != null) { - jpa_core_annotations_mapkeyenumerated_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyenumerated/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeyenumerated_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientStateless3Test.java index 7287b6dfb1..d6513c45fc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -180,12 +181,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyenumerated/"); - if(earResURL != null) { - jpa_core_annotations_mapkeyenumerated_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyenumerated/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeyenumerated_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientAppmanagedTest.java index 0520dd5277..8c4e34b822 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyjoincolumn/"); - if(earResURL != null) { - jpa_core_annotations_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyjoincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientAppmanagednotxTest.java index 238daeeff1..e47871b875 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyjoincolumn/"); - if(earResURL != null) { - jpa_core_annotations_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyjoincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientPmservletTest.java index ff115b5ff8..db6490aa47 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_mapkeyjoincolumn_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeyjoincolumn = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyjoincolumn/"); - if(earResURL != null) { - jpa_core_annotations_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyjoincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientPuservletTest.java index 9e46f48d99..cc4ad9237a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_mapkeyjoincolumn_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeyjoincolumn = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyjoincolumn/"); - if(earResURL != null) { - jpa_core_annotations_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyjoincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientStateful3Test.java index b4a9eb21a8..e0593167c7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyjoincolumn/"); - if(earResURL != null) { - jpa_core_annotations_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyjoincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientStateless3Test.java index a26387f612..a7502f4a8d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyjoincolumn/"); - if(earResURL != null) { - jpa_core_annotations_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeyjoincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientAppmanagedTest.java index 28d1780fc3..6dff642f70 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/"); - if(earResURL != null) { - jpa_core_annotations_mapKeyTemporal_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapKeyTemporal_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientAppmanagednotxTest.java index a16dfe7352..57329f08f1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/"); - if(earResURL != null) { - jpa_core_annotations_mapKeyTemporal_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapKeyTemporal_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientPmservletTest.java index 2d082627fd..bee208dd7e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_mapKeyTemporal_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_mapKeyTemporal = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal.jar"); @@ -149,12 +150,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/"); - if(earResURL != null) { - jpa_core_annotations_mapKeyTemporal_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapKeyTemporal_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientPuservletTest.java index a9cfd816d7..3915038be6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_mapKeyTemporal_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_mapKeyTemporal = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal.jar"); @@ -149,12 +150,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/"); - if(earResURL != null) { - jpa_core_annotations_mapKeyTemporal_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapKeyTemporal_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientStateful3Test.java index 14fbf66cdf..bec1fa1dc3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/"); - if(earResURL != null) { - jpa_core_annotations_mapKeyTemporal_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapKeyTemporal_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientStateless3Test.java index 6bc64d05dd..639b4e798e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/"); - if(earResURL != null) { - jpa_core_annotations_mapKeyTemporal_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapKeyTemporal_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientAppmanagedTest.java index df60b1af6e..c0cbd001b6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapsid_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapsid_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapsid_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapsid_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapsid_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapsid_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapsid_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapsid_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapsid/"); - if(earResURL != null) { - jpa_core_annotations_mapsid_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapsid/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapsid_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientAppmanagednotxTest.java index 0cb85c214a..dc8ed2e4fb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapsid/"); - if(earResURL != null) { - jpa_core_annotations_mapsid_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapsid/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapsid_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientPmservletTest.java index 5a44e79aa4..947c834c6a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_mapsid_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_mapsid = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapsid/"); - if(earResURL != null) { - jpa_core_annotations_mapsid_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapsid/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapsid_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientPuservletTest.java index cdc2c0253a..d1f060ddfd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_mapsid_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_mapsid = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapsid/"); - if(earResURL != null) { - jpa_core_annotations_mapsid_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapsid/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapsid_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientStateful3Test.java index 6a03262c53..535ba757f1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapsid_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapsid_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapsid_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapsid_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapsid_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapsid_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapsid_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapsid_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapsid/"); - if(earResURL != null) { - jpa_core_annotations_mapsid_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapsid/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapsid_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientStateless3Test.java index dfc2107111..7d8ad29214 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapsid_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_mapsid_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapsid_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapsid_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_mapsid_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_mapsid_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_mapsid_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_mapsid_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapsid/"); - if(earResURL != null) { - jpa_core_annotations_mapsid_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/mapsid/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_mapsid_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientAppmanagedTest.java index 5792286430..eb27b136a9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_nativequery_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_nativequery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_nativequery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_nativequery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_nativequery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_nativequery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_nativequery_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_nativequery_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/nativequery/"); - if(earResURL != null) { - jpa_core_annotations_nativequery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/nativequery/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_nativequery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientAppmanagednotxTest.java index acc399bddd..e0b857daaa 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/nativequery/"); - if(earResURL != null) { - jpa_core_annotations_nativequery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/nativequery/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_nativequery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientPmservletTest.java index 830ac7be40..c917c43cca 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_nativequery_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_nativequery = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/nativequery/"); - if(earResURL != null) { - jpa_core_annotations_nativequery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/nativequery/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_nativequery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientPuservletTest.java index 946d994d6a..2c761ccdbd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_nativequery_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_nativequery = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/nativequery/"); - if(earResURL != null) { - jpa_core_annotations_nativequery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/nativequery/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_nativequery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientStateful3Test.java index c20d07dd15..4c3f964d8d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_nativequery_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_nativequery_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_nativequery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_nativequery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_nativequery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_nativequery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_nativequery_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_nativequery_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/nativequery/"); - if(earResURL != null) { - jpa_core_annotations_nativequery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/nativequery/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_nativequery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientStateless3Test.java index 5e06682682..1968ce9d36 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_nativequery_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_nativequery_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_nativequery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_nativequery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_nativequery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_nativequery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_nativequery_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_nativequery_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/nativequery/"); - if(earResURL != null) { - jpa_core_annotations_nativequery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/nativequery/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_nativequery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientAppmanagedTest.java index d67fc0f281..94166992d1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_onexmanyuni_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_onexmanyuni_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_onexmanyuni_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_onexmanyuni_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_onexmanyuni_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_onexmanyuni_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_onexmanyuni_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_onexmanyuni_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/onexmanyuni/"); - if(earResURL != null) { - jpa_core_annotations_onexmanyuni_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/onexmanyuni/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_onexmanyuni_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientAppmanagednotxTest.java index 577505597d..d786f02000 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/onexmanyuni/"); - if(earResURL != null) { - jpa_core_annotations_onexmanyuni_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/onexmanyuni/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_onexmanyuni_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientPmservletTest.java index c0ca8ff1b7..043afa731f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_onexmanyuni_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_onexmanyuni = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/onexmanyuni/"); - if(earResURL != null) { - jpa_core_annotations_onexmanyuni_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/onexmanyuni/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_onexmanyuni_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientPuservletTest.java index 3a2076d3cd..6c325d7800 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_onexmanyuni_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_onexmanyuni = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/onexmanyuni/"); - if(earResURL != null) { - jpa_core_annotations_onexmanyuni_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/onexmanyuni/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_onexmanyuni_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientStateful3Test.java index ab1d755729..54d11c6c9a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_onexmanyuni_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_onexmanyuni_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_onexmanyuni_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_onexmanyuni_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_onexmanyuni_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_onexmanyuni_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_onexmanyuni_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_onexmanyuni_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/onexmanyuni/"); - if(earResURL != null) { - jpa_core_annotations_onexmanyuni_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/onexmanyuni/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_onexmanyuni_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientStateless3Test.java index 8f7238504c..4945975c27 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_onexmanyuni_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_onexmanyuni_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_onexmanyuni_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_onexmanyuni_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_onexmanyuni_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_onexmanyuni_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_onexmanyuni_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_onexmanyuni_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/onexmanyuni/"); - if(earResURL != null) { - jpa_core_annotations_onexmanyuni_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/onexmanyuni/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_onexmanyuni_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1AppmanagedTest.java index 98f1a62d14..81d2a7d4f9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1AppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_orderby_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -180,12 +181,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/"); - if(earResURL != null) { - jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1AppmanagednotxTest.java index 3866e79f90..1aea45baa8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1AppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -180,12 +181,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/"); - if(earResURL != null) { - jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1PmservletTest.java index 0f2462f895..a68e4d334b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1PmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_orderby_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_orderby = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby.jar"); @@ -153,12 +154,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/"); - if(earResURL != null) { - jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1PuservletTest.java index 885bb808df..9cae68b132 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1PuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_orderby_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_orderby = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby.jar"); @@ -153,12 +154,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/"); - if(earResURL != null) { - jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1Stateful3Test.java index 9c04a590e2..749068fbeb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1Stateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_orderby_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -180,12 +181,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/"); - if(earResURL != null) { - jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1Stateless3Test.java index 954623160b..0ed061e4c4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1Stateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_orderby_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -180,12 +181,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/"); - if(earResURL != null) { - jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2AppmanagedTest.java index b5cc9390b9..ea4863d1ab 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2AppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_orderby_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -180,12 +181,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/"); - if(earResURL != null) { - jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2AppmanagednotxTest.java index 8df35740b9..4d5acee8bb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2AppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -180,12 +181,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/"); - if(earResURL != null) { - jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2PmservletTest.java index 2d8f53e9f3..68f386c6a1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2PmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_orderby_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_orderby = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby.jar"); @@ -153,12 +154,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/"); - if(earResURL != null) { - jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2PuservletTest.java index 6451d51e20..c0f850c88b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2PuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_orderby_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_orderby = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby.jar"); @@ -153,12 +154,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/"); - if(earResURL != null) { - jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2Stateful3Test.java index 181cc9bb5a..3cd5cc8b4d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2Stateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_orderby_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -180,12 +181,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/"); - if(earResURL != null) { - jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2Stateless3Test.java index b017fa0c94..61eeedb55f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2Stateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_orderby_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -180,12 +181,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/"); - if(earResURL != null) { - jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3AppmanagedTest.java index a835f3a165..c8d4de502f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3AppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_appmanaged_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_orderby_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_appmanaged_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_appmanaged_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -180,12 +181,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/"); - if(earResURL != null) { - jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3AppmanagednotxTest.java index 9abeb8486a..a4d384ad82 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3AppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -180,12 +181,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/"); - if(earResURL != null) { - jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3PmservletTest.java index 46bb2c1319..9af0b0f1be 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3PmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_orderby_pmservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_orderby = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby.jar"); @@ -153,12 +154,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/"); - if(earResURL != null) { - jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3PuservletTest.java index a8586707d4..c35aa4eebe 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3PuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_orderby_puservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_orderby = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby.jar"); @@ -153,12 +154,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/"); - if(earResURL != null) { - jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3Stateful3Test.java index f3faff12e4..ad828b932c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3Stateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_stateful3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_orderby_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_stateful3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_stateful3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -180,12 +181,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/"); - if(earResURL != null) { - jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3Stateless3Test.java index 533e5e42cb..40ae57ceab 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3Stateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_stateless3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_orderby_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_orderby_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_orderby_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_stateless3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_orderby_stateless3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -180,12 +181,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/"); - if(earResURL != null) { - jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/orderby/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_orderby_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1AppmanagedTest.java index c44a7aa9c8..2aa3461a46 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1AppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_ordercolumn_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/"); - if(earResURL != null) { - jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1AppmanagednotxTest.java index 390c1f173e..ddf0ceb3e1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1AppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/"); - if(earResURL != null) { - jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1PmservletTest.java index 76a1e79b94..859c3bc97f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1PmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_ordercolumn_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_ordercolumn = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn.jar"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/"); - if(earResURL != null) { - jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1PuservletTest.java index 8aba97babf..779f75596a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1PuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_ordercolumn_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_ordercolumn = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn.jar"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/"); - if(earResURL != null) { - jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1Stateful3Test.java index 0500fcd537..511625166e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1Stateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_ordercolumn_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/"); - if(earResURL != null) { - jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1Stateless3Test.java index 3a30f5245c..cb9d3a5c29 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1Stateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_ordercolumn_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/"); - if(earResURL != null) { - jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2AppmanagedTest.java index 959de22832..65b849596b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2AppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_ordercolumn_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_ordercolumn_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/"); - if(earResURL != null) { - jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2AppmanagednotxTest.java index 6c4b0c4d68..f3c093402c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2AppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/"); - if(earResURL != null) { - jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2PmservletTest.java index ebeea54205..10aaefed47 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2PmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_ordercolumn_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_ordercolumn = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn.jar"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/"); - if(earResURL != null) { - jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2PuservletTest.java index 14041e146e..18964e1161 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2PuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_ordercolumn_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_ordercolumn = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn.jar"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/"); - if(earResURL != null) { - jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2Stateful3Test.java index 4229c35ef5..4244555012 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2Stateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_ordercolumn_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_ordercolumn_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/"); - if(earResURL != null) { - jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2Stateless3Test.java index 2aab9179da..df28956b18 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2Stateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_ordercolumn_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_ordercolumn_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/"); - if(earResURL != null) { - jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/ordercolumn/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_ordercolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1AppmanagedTest.java index 96a940e55c..affc2b50a5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1AppmanagedTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1AppmanagednotxTest.java index 6b4405bed9..e9fd33ec53 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1AppmanagednotxTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1PmservletTest.java index ccddf71376..f357cd7003 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The web.xml descriptor URL warResURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_tableGenerator_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator.jar"); @@ -146,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1PuservletTest.java index cd698c6e40..9b58399716 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The web.xml descriptor URL warResURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_tableGenerator_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator.jar"); @@ -146,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1Stateful3Test.java index 8a8c3c6094..38a5b0de47 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1Stateful3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1Stateless3Test.java index 8c88ab3af1..08b476e533 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1Stateless3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2AppmanagedTest.java index 840e9abc89..04a4c8965c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2AppmanagedTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client2.class + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client2.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2AppmanagednotxTest.java index 65849bd419..3eb2d4ba6a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2AppmanagednotxTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, - ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client2.class + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client2.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2PmservletTest.java index 5420443a41..f8024f05a7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client2.class + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client2.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The web.xml descriptor URL warResURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_tableGenerator_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator.jar"); @@ -146,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2PuservletTest.java index f920863cd4..147e758301 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client2.class + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client2.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The web.xml descriptor URL warResURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_tableGenerator_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator.jar"); @@ -146,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2Stateful3Test.java index 17ab606986..efdf371b4d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2Stateful3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client2.class + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client2.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2Stateless3Test.java index e1d58e4927..3805af3ad5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2Stateless3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client2.class + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client2.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3AppmanagedTest.java index 1b0acc2b91..cf91bcee89 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3AppmanagedTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The application-client.xml descriptor URL resURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_appmanaged_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3AppmanagednotxTest.java index 88b7d5445c..e365032655 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3AppmanagednotxTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The application-client.xml descriptor URL resURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3PmservletTest.java index ed229bee25..b976af228a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The web.xml descriptor URL warResURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_tableGenerator_pmservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator.jar"); @@ -146,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3PuservletTest.java index 45cf9ee05d..73298a1a8d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The web.xml descriptor URL warResURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_tableGenerator_puservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator.jar"); @@ -146,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3Stateful3Test.java index 6b7bc782d9..85fecd400a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3Stateful3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The application-client.xml descriptor URL resURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_stateful3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3Stateless3Test.java index c332a2228a..727f973683 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3Stateless3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The application-client.xml descriptor URL resURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_stateless3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4AppmanagedTest.java index 208a11404e..5347fed3e0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4AppmanagedTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The application-client.xml descriptor URL resURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_appmanaged_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_appmanaged_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4AppmanagednotxTest.java index 7bc954d6c6..be48b38d84 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4AppmanagednotxTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The application-client.xml descriptor URL resURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4PmservletTest.java index 6c97dd0393..d0ab68559c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The web.xml descriptor URL warResURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_tableGenerator_pmservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator.jar"); @@ -146,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4PuservletTest.java index 5053ec621a..5950fdd924 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The web.xml descriptor URL warResURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_tableGenerator_puservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator.jar"); @@ -146,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4Stateful3Test.java index 6d4045d231..ff49986f30 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4Stateful3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The application-client.xml descriptor URL resURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_stateful3_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_stateful3_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4Stateless3Test.java index 7cb0fef9fb..d6746c208e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4Stateless3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The application-client.xml descriptor URL resURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_stateless3_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.tableGenerator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_tableGenerator_stateless3_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/"); - if(earResURL != null) { - jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/tableGenerator/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_tableGenerator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientAppmanagedTest.java index 4e9039222a..43c1e896e6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_temporal_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_temporal_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_temporal_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_temporal_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_temporal_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_temporal_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_temporal_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_temporal_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/temporal/"); - if(earResURL != null) { - jpa_core_annotations_temporal_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/temporal/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_temporal_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientAppmanagednotxTest.java index 1351c7d069..bba84f1984 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_temporal_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_temporal_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_temporal_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_temporal_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_temporal_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_temporal_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_temporal_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_temporal_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/temporal/"); - if(earResURL != null) { - jpa_core_annotations_temporal_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/temporal/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_temporal_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientPmservletTest.java index 03d3ead5dd..f581aac2d3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_temporal_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_temporal = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/temporal/"); - if(earResURL != null) { - jpa_core_annotations_temporal_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/temporal/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_temporal_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientPuservletTest.java index 93ff12e5bf..f1459063eb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_temporal_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_temporal = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/temporal/"); - if(earResURL != null) { - jpa_core_annotations_temporal_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/temporal/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_temporal_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientStateful3Test.java index bab533fe2a..83756e0748 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_temporal_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_temporal_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_temporal_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_temporal_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_temporal_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_temporal_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_temporal_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_temporal_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/temporal/"); - if(earResURL != null) { - jpa_core_annotations_temporal_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/temporal/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_temporal_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientStateless3Test.java index ae5a1e9477..6eb92627a1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_temporal_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_temporal_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_temporal_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_temporal_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_temporal_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_temporal_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_temporal_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_temporal_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/temporal/"); - if(earResURL != null) { - jpa_core_annotations_temporal_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/annotations/temporal/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_temporal_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1AppmanagedTest.java index 00e33c92ea..2501916367 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1AppmanagedTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_version_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_version_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_version_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1AppmanagednotxTest.java index f2d45594d3..2d66a4374c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1AppmanagednotxTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1PmservletTest.java index 4ca83d64dd..c556e77fba 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The web.xml descriptor URL warResURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_version_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_version = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version.jar"); @@ -156,12 +158,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1PuservletTest.java index 4232dd3b3f..e16211062c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The web.xml descriptor URL warResURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_version_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_version = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version.jar"); @@ -156,12 +158,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1Stateful3Test.java index ae9f34fa48..979ca5cfdc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1Stateful3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_version_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_version_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_version_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1Stateless3Test.java index c1ca00e50d..ce58b75ce1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1Stateless3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_version_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_version_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_version_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2AppmanagedTest.java index 8b6eee7876..9b988a1b6c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2AppmanagedTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_version_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - ee.jakarta.tck.persistence.core.annotations.version.Client2.class + ee.jakarta.tck.persistence.core.annotations.version.Client2.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_version_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_version_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2AppmanagednotxTest.java index 22796c9ebb..1ea96f0d0a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2AppmanagednotxTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, ee.jakarta.tck.persistence.core.annotations.version.Client2.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2PmservletTest.java index 736831e872..57d34ce147 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - ee.jakarta.tck.persistence.core.annotations.version.Client2.class + ee.jakarta.tck.persistence.core.annotations.version.Client2.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The web.xml descriptor URL warResURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_version_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_version = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version.jar"); @@ -156,12 +158,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2PuservletTest.java index 23a0c521f6..f49bcedee4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - ee.jakarta.tck.persistence.core.annotations.version.Client2.class + ee.jakarta.tck.persistence.core.annotations.version.Client2.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The web.xml descriptor URL warResURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_version_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_version = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version.jar"); @@ -156,12 +158,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2Stateful3Test.java index 7813d65557..bb16b1abfb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2Stateful3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_version_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - ee.jakarta.tck.persistence.core.annotations.version.Client2.class + ee.jakarta.tck.persistence.core.annotations.version.Client2.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_version_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_version_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2Stateless3Test.java index cfb34577ac..b24dacbdcc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2Stateless3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_version_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - ee.jakarta.tck.persistence.core.annotations.version.Client2.class + ee.jakarta.tck.persistence.core.annotations.version.Client2.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_version_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_version_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3AppmanagedTest.java index 25d9f855a5..1a016147c4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3AppmanagedTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The application-client.xml descriptor URL resURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_appmanaged_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_version_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_version_appmanaged_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_version_appmanaged_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3AppmanagednotxTest.java index e8ff7e209e..5a9eb292e1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3AppmanagednotxTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The application-client.xml descriptor URL resURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_appmanagedNoTx_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3PmservletTest.java index 61dc29e352..0a837cc68c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The web.xml descriptor URL warResURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_version_pmservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_version = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version.jar"); @@ -156,12 +158,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3PuservletTest.java index 9f711bde76..cba09919bc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The web.xml descriptor URL warResURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_version_puservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_version = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version.jar"); @@ -156,12 +158,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3Stateful3Test.java index 8f17ad9ef9..4356897286 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3Stateful3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The application-client.xml descriptor URL resURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_stateful3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_version_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_version_stateful3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_version_stateful3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3Stateless3Test.java index 45fb71be7d..24a42a36f9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3Stateless3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The application-client.xml descriptor URL resURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_stateless3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_version_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_version_stateless3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_version_stateless3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4AppmanagedTest.java index 9d557bf986..8faf1ce254 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4AppmanagedTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The application-client.xml descriptor URL resURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_appmanaged_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_version_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_version_appmanaged_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_version_appmanaged_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4AppmanagednotxTest.java index f4a785b425..3165b70fb3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4AppmanagednotxTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The application-client.xml descriptor URL resURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_appmanagedNoTx_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_version_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4PmservletTest.java index a8dbe75a16..e71cb9d6bd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The web.xml descriptor URL warResURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_version_pmservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_version = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version.jar"); @@ -156,12 +158,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4PuservletTest.java index 4dd093ad43..85dc7a7684 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The web.xml descriptor URL warResURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_annotations_version_puservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_annotations_version = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version.jar"); @@ -156,12 +158,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4Stateful3Test.java index e38c77b4df..8444231a69 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4Stateful3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The application-client.xml descriptor URL resURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_stateful3_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_version_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_version_stateful3_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_version_stateful3_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4Stateless3Test.java index 4c9a84a204..da990dc707 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4Stateless3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The application-client.xml descriptor URL resURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_stateless3_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_annotations_version_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.annotations.version.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_annotations_version_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_annotations_version_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_annotations_version_stateless3_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_annotations_version_stateless3_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/"); - if(earResURL != null) { - jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/annotations/version/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_annotations_version_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientAppmanagedTest.java index 9f441c1605..ccf02da541 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_basic_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_basic_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_basic_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_basic_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/basic/"); - if(earResURL != null) { - jpa_core_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/basic/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientAppmanagednotxTest.java index 502bcfc827..d3582dc69e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_basic_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_basic_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_basic_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_basic_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/basic/"); - if(earResURL != null) { - jpa_core_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/basic/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientPmservletTest.java index b91690b230..9892834905 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_basic_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_basic = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/basic/"); - if(earResURL != null) { - jpa_core_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/basic/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientPuservletTest.java index 814fe33f58..4a6b2f48e4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_basic_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_basic = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/basic/"); - if(earResURL != null) { - jpa_core_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/basic/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientStateful3Test.java index 21885f9b97..4bc6304543 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_basic_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_basic_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_basic_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_basic_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/basic/"); - if(earResURL != null) { - jpa_core_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/basic/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientStateless3Test.java index 8bc6d57736..3b337adde5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_basic_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_basic_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_basic_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_basic_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/basic/"); - if(earResURL != null) { - jpa_core_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/basic/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientAppmanagedTest.java index c74f281ad2..f3253557bc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_cache_basicTests_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_cache_basicTests_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_cache_basicTests_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_cache_basicTests_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_cache_basicTests_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_cache_basicTests_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_cache_basicTests_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_cache_basicTests_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/cache/basicTests/"); - if(earResURL != null) { - jpa_core_cache_basicTests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/cache/basicTests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_cache_basicTests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientAppmanagednotxTest.java index 1bafe5689c..b9420d600e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_cache_basicTests_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_cache_basicTests_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_cache_basicTests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_cache_basicTests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_cache_basicTests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_cache_basicTests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_cache_basicTests_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_cache_basicTests_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/cache/basicTests/"); - if(earResURL != null) { - jpa_core_cache_basicTests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/cache/basicTests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_cache_basicTests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientPmservletTest.java index 58748e0438..222b5cc11b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_cache_basicTests_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_cache_basicTests = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/cache/basicTests/"); - if(earResURL != null) { - jpa_core_cache_basicTests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/cache/basicTests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_cache_basicTests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientPuservletTest.java index 9eb0a3871b..c15a4fcd57 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_cache_basicTests_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_cache_basicTests = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/cache/basicTests/"); - if(earResURL != null) { - jpa_core_cache_basicTests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/cache/basicTests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_cache_basicTests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientStateful3Test.java index c2335b7c3c..c96dc90db5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_cache_basicTests_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_cache_basicTests_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_cache_basicTests_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_cache_basicTests_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_cache_basicTests_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_cache_basicTests_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_cache_basicTests_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_cache_basicTests_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/cache/basicTests/"); - if(earResURL != null) { - jpa_core_cache_basicTests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/cache/basicTests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_cache_basicTests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientStateless3Test.java index 991f57f66b..4596bcf8e3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_cache_basicTests_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_cache_basicTests_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_cache_basicTests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_cache_basicTests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_cache_basicTests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_cache_basicTests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_cache_basicTests_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_cache_basicTests_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/cache/basicTests/"); - if(earResURL != null) { - jpa_core_cache_basicTests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/cache/basicTests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_cache_basicTests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientAppmanagedTest.java index 61bd7089be..d215a4e03e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_inheritance_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_inheritance_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_inheritance_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_inheritance_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_inheritance_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_inheritance_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_inheritance_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_inheritance_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -191,12 +192,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/inheritance/"); - if(earResURL != null) { - jpa_core_callback_inheritance_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/inheritance/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_inheritance_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientAppmanagednotxTest.java index 656c781b58..777235f309 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_inheritance_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_inheritance_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_inheritance_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_inheritance_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_inheritance_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_inheritance_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_inheritance_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_inheritance_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -191,12 +192,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/inheritance/"); - if(earResURL != null) { - jpa_core_callback_inheritance_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/inheritance/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_inheritance_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientPmservletTest.java index da7fbeea8b..e31ef9e8f5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientPmservletTest.java @@ -112,6 +112,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_callback_inheritance_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_callback_inheritance = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance.jar"); @@ -164,12 +165,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/inheritance/"); - if(earResURL != null) { - jpa_core_callback_inheritance_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/inheritance/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_inheritance_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientPuservletTest.java index e77461cc23..411b1c3395 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientPuservletTest.java @@ -112,6 +112,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_callback_inheritance_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_callback_inheritance = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance.jar"); @@ -164,12 +165,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/inheritance/"); - if(earResURL != null) { - jpa_core_callback_inheritance_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/inheritance/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_inheritance_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientStateful3Test.java index 1cd951e73f..9e420e181e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_inheritance_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_inheritance_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_inheritance_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_inheritance_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_inheritance_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_inheritance_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_inheritance_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_inheritance_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -191,12 +192,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/inheritance/"); - if(earResURL != null) { - jpa_core_callback_inheritance_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/inheritance/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_inheritance_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientStateless3Test.java index 2c4cb9a5b0..44559e3bcc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_inheritance_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_inheritance_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_inheritance_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_inheritance_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_inheritance_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_inheritance_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_inheritance_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_inheritance_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -191,12 +192,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/inheritance/"); - if(earResURL != null) { - jpa_core_callback_inheritance_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/inheritance/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_inheritance_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientAppmanagedTest.java index 80061a2a2a..ac5575f6f4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientAppmanagedTest.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_listener_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_listener_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener_appmanaged_vehicle_ejb.jar"); // The class files @@ -138,17 +138,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_listener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_listener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_listener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_listener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_listener_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_listener_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -199,12 +200,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listener/"); - if(earResURL != null) { - jpa_core_callback_listener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_listener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientAppmanagednotxTest.java index 4879b3b942..cb7261215e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientAppmanagednotxTest.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_listener_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_listener_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -138,17 +138,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_listener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_listener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_listener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_listener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_listener_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_listener_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -199,12 +200,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listener/"); - if(earResURL != null) { - jpa_core_callback_listener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_listener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientPmservletTest.java index e4649d5275..e22a2e214d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientPmservletTest.java @@ -124,6 +124,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_callback_listener_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_callback_listener = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener.jar"); @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listener/"); - if(earResURL != null) { - jpa_core_callback_listener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_listener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientPuservletTest.java index 3902b6ee58..dead06730a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientPuservletTest.java @@ -124,6 +124,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_callback_listener_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_callback_listener = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener.jar"); @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listener/"); - if(earResURL != null) { - jpa_core_callback_listener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_listener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientStateful3Test.java index 8f36553e68..ba7c17bac4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientStateful3Test.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_listener_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_listener_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener_stateful3_vehicle_ejb.jar"); // The class files @@ -138,17 +138,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_listener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_listener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_listener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_listener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_listener_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_listener_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -199,12 +200,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listener/"); - if(earResURL != null) { - jpa_core_callback_listener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_listener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientStateless3Test.java index abb5c22a76..09ae34f53c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientStateless3Test.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_listener_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_listener_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener_stateless3_vehicle_ejb.jar"); // The class files @@ -138,17 +138,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_listener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_listener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_listener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_listener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_listener_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_listener_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -199,12 +200,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listener/"); - if(earResURL != null) { - jpa_core_callback_listener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_listener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientAppmanagedTest.java index f43d162f33..48e3c915fb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_listeneroverride_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_listeneroverride_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_listeneroverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_listeneroverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_listeneroverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_listeneroverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_listeneroverride_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_listeneroverride_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -187,12 +188,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listeneroverride/"); - if(earResURL != null) { - jpa_core_callback_listeneroverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listeneroverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_listeneroverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientAppmanagednotxTest.java index 6fef246083..7abecccdd7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -187,12 +188,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listeneroverride/"); - if(earResURL != null) { - jpa_core_callback_listeneroverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listeneroverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_listeneroverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientPmservletTest.java index 2d7b3c0801..5082a27056 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientPmservletTest.java @@ -112,6 +112,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_callback_listeneroverride_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_callback_listeneroverride = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride.jar"); @@ -160,12 +161,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listeneroverride/"); - if(earResURL != null) { - jpa_core_callback_listeneroverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listeneroverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_listeneroverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientPuservletTest.java index c7f505b5ba..bde7cd983f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientPuservletTest.java @@ -112,6 +112,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_callback_listeneroverride_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_callback_listeneroverride = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride.jar"); @@ -160,12 +161,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listeneroverride/"); - if(earResURL != null) { - jpa_core_callback_listeneroverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listeneroverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_listeneroverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientStateful3Test.java index a83b6addc6..135e93436d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_listeneroverride_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_listeneroverride_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_listeneroverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_listeneroverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_listeneroverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_listeneroverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_listeneroverride_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_listeneroverride_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -187,12 +188,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listeneroverride/"); - if(earResURL != null) { - jpa_core_callback_listeneroverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listeneroverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_listeneroverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientStateless3Test.java index 927304b08a..a333af1958 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_listeneroverride_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_listeneroverride_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_listeneroverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_listeneroverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_listeneroverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_listeneroverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_listeneroverride_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_listeneroverride_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -187,12 +188,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listeneroverride/"); - if(earResURL != null) { - jpa_core_callback_listeneroverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/listeneroverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_listeneroverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientAppmanagedTest.java index 89aa4b20b9..3f625ab82a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientAppmanagedTest.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_method_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_method_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method_appmanaged_vehicle_ejb.jar"); // The class files @@ -138,17 +138,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_method_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_method_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_method_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_method_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_method_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_method_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -198,12 +199,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/method/"); - if(earResURL != null) { - jpa_core_callback_method_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/method/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_method_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientAppmanagednotxTest.java index 0af2c8fd6c..a2c17a4996 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientAppmanagednotxTest.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_method_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_method_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -138,17 +138,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_method_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_method_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_method_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_method_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_method_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_method_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -198,12 +199,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/method/"); - if(earResURL != null) { - jpa_core_callback_method_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/method/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_method_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientPmservletTest.java index d1e6f2f8ec..9044922fad 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientPmservletTest.java @@ -124,6 +124,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_callback_method_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_callback_method = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method.jar"); @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/method/"); - if(earResURL != null) { - jpa_core_callback_method_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/method/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_method_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientPuservletTest.java index aba8bea22a..3c4dfe84be 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientPuservletTest.java @@ -124,6 +124,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_callback_method_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_callback_method = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method.jar"); @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/method/"); - if(earResURL != null) { - jpa_core_callback_method_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/method/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_method_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientStateful3Test.java index a25cfdd3a1..74118b2b82 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientStateful3Test.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_method_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_method_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method_stateful3_vehicle_ejb.jar"); // The class files @@ -138,17 +138,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_method_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_method_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_method_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_method_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_method_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_method_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -198,12 +199,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/method/"); - if(earResURL != null) { - jpa_core_callback_method_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/method/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_method_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientStateless3Test.java index dda2d1f5f6..73d30a89af 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientStateless3Test.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_method_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_method_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method_stateless3_vehicle_ejb.jar"); // The class files @@ -138,17 +138,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_method_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_method_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_method_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_method_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_method_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_method_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -198,12 +199,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/method/"); - if(earResURL != null) { - jpa_core_callback_method_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/method/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_method_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientAppmanagedTest.java index f507fe08d0..8f7cbf72a0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_methodoverride_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_methodoverride_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_methodoverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_methodoverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_methodoverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_methodoverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_methodoverride_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_methodoverride_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -186,12 +187,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/methodoverride/"); - if(earResURL != null) { - jpa_core_callback_methodoverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/methodoverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_methodoverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientAppmanagednotxTest.java index 48316396ef..8becc72a34 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -186,12 +187,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/methodoverride/"); - if(earResURL != null) { - jpa_core_callback_methodoverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/methodoverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_methodoverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientPmservletTest.java index 7bbab8a09c..089ca479ed 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientPmservletTest.java @@ -112,6 +112,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_callback_methodoverride_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_callback_methodoverride = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride.jar"); @@ -159,12 +160,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/methodoverride/"); - if(earResURL != null) { - jpa_core_callback_methodoverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/methodoverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_methodoverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientPuservletTest.java index 3168f2bc6a..7cdfdcd767 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientPuservletTest.java @@ -112,6 +112,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_callback_methodoverride_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_callback_methodoverride = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride.jar"); @@ -159,12 +160,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/methodoverride/"); - if(earResURL != null) { - jpa_core_callback_methodoverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/methodoverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_methodoverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientStateful3Test.java index 97e8e7163d..dcb34aab41 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_methodoverride_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_methodoverride_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_methodoverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_methodoverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_methodoverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_methodoverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_methodoverride_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_methodoverride_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -186,12 +187,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/methodoverride/"); - if(earResURL != null) { - jpa_core_callback_methodoverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/methodoverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_methodoverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientStateless3Test.java index 15e61fd226..9be75c9bd7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_methodoverride_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_methodoverride_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_methodoverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_methodoverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_methodoverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_methodoverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_methodoverride_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_methodoverride_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -186,12 +187,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/methodoverride/"); - if(earResURL != null) { - jpa_core_callback_methodoverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/methodoverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_methodoverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientAppmanagedTest.java index 876e0de694..88eaf97460 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_xml_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_xml_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_xml_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_xml_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_xml_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_xml_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_xml_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_xml_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -188,12 +189,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/xml/"); - if(earResURL != null) { - jpa_core_callback_xml_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/xml/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_xml_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientAppmanagednotxTest.java index 8b02a02581..09e23cf37a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_xml_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_xml_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_xml_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_xml_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_xml_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_xml_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_xml_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_xml_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -188,12 +189,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/xml/"); - if(earResURL != null) { - jpa_core_callback_xml_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/xml/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_xml_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientPmservletTest.java index b9ae9babda..0716e48efc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientPmservletTest.java @@ -112,6 +112,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_callback_xml_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_callback_xml = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml.jar"); @@ -161,12 +162,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/xml/"); - if(earResURL != null) { - jpa_core_callback_xml_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/xml/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_xml_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientPuservletTest.java index f1a7db9a6b..c43d8a3101 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientPuservletTest.java @@ -112,6 +112,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_callback_xml_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_callback_xml = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml.jar"); @@ -161,12 +162,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/xml/"); - if(earResURL != null) { - jpa_core_callback_xml_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/xml/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_xml_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientStateful3Test.java index 75a5e4a12f..3f92bfa39f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_xml_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_xml_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_xml_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_xml_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_xml_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_xml_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_xml_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_xml_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -188,12 +189,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/xml/"); - if(earResURL != null) { - jpa_core_callback_xml_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/xml/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_xml_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientStateless3Test.java index 3fea501ee8..677eb88554 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_xml_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_callback_xml_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_callback_xml_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_xml_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_callback_xml_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_callback_xml_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_callback_xml_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_callback_xml_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -188,12 +189,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/xml/"); - if(earResURL != null) { - jpa_core_callback_xml_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/callback/xml/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_callback_xml_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1AppmanagedTest.java index 471705fde1..acb6ae2721 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1AppmanagednotxTest.java index b66db990ef..d2fb1520ab 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1PmservletTest.java index 1ee67b0985..3fe04592d5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1PuservletTest.java index 2027fd963d..cd82ed4999 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1Stateful3Test.java index 80c18a6cd8..5645bf180a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1Stateless3Test.java index eb04a50d62..a3b17dc81c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2AppmanagedTest.java index f7ce34463b..5545b6e1d7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2AppmanagednotxTest.java index 84e1bc7f2b..73886a3502 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2PmservletTest.java index 889d69383e..7583f87dac 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2PuservletTest.java index 4d4db39fa4..3c730c235a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2Stateful3Test.java index 98f138eb88..d5fd4dcfdb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2Stateless3Test.java index 0f937569bd..02c3aac9ce 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3AppmanagedTest.java index 9db4ffbf46..166a3e80f0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client3.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3AppmanagednotxTest.java index f6444db1e3..faec3e733d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3PmservletTest.java index 4d4b0d83df..5a08c2c304 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3PuservletTest.java index a0e8a63f00..8612fb2fd0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3Stateful3Test.java index aba8601944..3bb014f99d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client3.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3Stateless3Test.java index 4d9f25f8ce..6d6e73f71c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.CriteriaBuilder.Client3.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4AppmanagedTest.java index 0f447cd4e1..383dba88dd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4AppmanagednotxTest.java index 4440ad794d..c4c79f1b42 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4PmservletTest.java index b8201f9990..22a1821928 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4PuservletTest.java index 521c22dd02..a4f299d3de 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4Stateful3Test.java index 75d7812813..0f91b7236d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4Stateless3Test.java index 96cb68d51a..b5ff7ccd79 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5AppmanagedTest.java index dd169568b6..06193cb5f1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client, Client5.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client5.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client5.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client5.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client5.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb, Client5.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb, Client5.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5AppmanagednotxTest.java index b8bce6c997..0f3d228f5d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client, Client5.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client5.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client5.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client5.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client5.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb, Client5.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb, Client5.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5PmservletTest.java index 67df2ae0fb..4b96ef4f2b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web, Client5.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5PuservletTest.java index 08d67f99e4..8bcf0252f5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web, Client5.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5Stateful3Test.java index 4e9e7183f1..8d6998228c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client, Client5.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client5.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client5.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client5.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client5.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb, Client5.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb, Client5.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5Stateless3Test.java index 680ad0dc99..3cab536f72 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client, Client5.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client5.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client5.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client5.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client5.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb, Client5.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb, Client5.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6AppmanagedTest.java index d26f5f5466..0f599bc70d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client, Client6.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client6.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client6.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client6.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client6.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb, Client6.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb, Client6.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6AppmanagednotxTest.java index 5d66fb7286..9ad47d7f49 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client, Client6.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client6.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client6.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client6.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client6.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb, Client6.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb, Client6.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6PmservletTest.java index 1ae7a2736c..c7abbd947d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web, Client6.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6PuservletTest.java index 5fe654033a..bbb1b59fee 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web, Client6.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6Stateful3Test.java index cde42cbc63..0be2486996 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client, Client6.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client6.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client6.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client6.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client6.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb, Client6.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb, Client6.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6Stateless3Test.java index 0071a4178e..e4bbb7d063 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client, Client6.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client6.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client6.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client6.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client6.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb, Client6.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb, Client6.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7AppmanagedTest.java index 33e7378e20..b6a954bb86 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client, Client7.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client7.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client7.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client7.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client7.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb, Client7.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb, Client7.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client7.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7AppmanagednotxTest.java index 2c6f4f2f21..7b8312ce4a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client, Client7.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client7.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client7.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client7.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client7.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb, Client7.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb, Client7.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client7.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7PmservletTest.java index a23a019987..7b458587d6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web, Client7.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client7.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7PuservletTest.java index d66e36c5f0..c5b7ca1183 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web, Client7.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client7.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7Stateful3Test.java index e3d5f27e2b..39abe0e87a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client, Client7.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client7.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client7.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client7.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client7.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb, Client7.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb, Client7.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client7.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7Stateless3Test.java index 62f42a41a8..c674edb35e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client, Client7.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client7.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client7.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client7.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client7.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb, Client7.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb, Client7.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client7.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8AppmanagedTest.java index fa0d00d872..04a5ba0cf9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client, Client8.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client8.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client8.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client8.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client8.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb, Client8.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_ejb, Client8.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client8.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client8.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client8.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8AppmanagednotxTest.java index f46ac266c2..24f9eeee87 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client, Client8.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client8.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client8.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client8.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client8.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb, Client8.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_ejb, Client8.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client8.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client8.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client8.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8PmservletTest.java index c46cd452e6..4a113df660 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriapia_CriteriaBuilder_pmservlet_vehicle_web, Client8.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client8.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client8.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client8.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8PuservletTest.java index 862a29c291..08a369ee85 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriapia_CriteriaBuilder_puservlet_vehicle_web, Client8.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client8.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client8.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client8.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8Stateful3Test.java index 04a26fc1ba..4969038614 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client, Client8.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client8.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client8.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client8.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client8.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb, Client8.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_ejb, Client8.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client8.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client8.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client8.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8Stateless3Test.java index d192f1b6af..f0f4d7f61b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client, Client8.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client8.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client8.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client8.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client8.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb, Client8.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_ejb, Client8.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client8.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client8.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/.ear.sun-application.xml"); + earResURL = Client8.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaBuilder_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientAppmanagedTest.java index 7c1c625446..bd98733584 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientAppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaDelete/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaDelete_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaDelete/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaDelete_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientAppmanagednotxTest.java index 68d5ba67e0..3369425c27 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientAppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaDelete/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaDelete_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaDelete/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaDelete_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientPmservletTest.java index 8cb0273df2..921d0c0c16 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientPmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriapia_CriteriaDelete_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaDelete = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaDelete/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaDelete_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaDelete/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaDelete_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientPuservletTest.java index 844f373a4c..ce82dd62e3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientPuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriapia_CriteriaDelete_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaDelete = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaDelete/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaDelete_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaDelete/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaDelete_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientStateful3Test.java index d8c5f997d2..40815633c9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientStateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaDelete/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaDelete_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaDelete/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaDelete_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientStateless3Test.java index 2126f725c3..e518c0e2d1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientStateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaDelete/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaDelete_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaDelete/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaDelete_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1AppmanagedTest.java index e4b5f737b9..46c38eeb09 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1AppmanagednotxTest.java index ca551108a3..9f197efe2a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1PmservletTest.java index 3332c0f58a..95f0c10e5a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery.jar"); @@ -179,12 +180,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1PuservletTest.java index 6ed7a3ce3e..05f86909ae 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_CriteriaQuery_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery.jar"); @@ -179,12 +180,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1Stateful3Test.java index ffda22b98f..8a91a5c977 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1Stateless3Test.java index e75d1880d7..d6008320b3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2AppmanagedTest.java index 9e3ce7e11e..33e5cf119a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2AppmanagednotxTest.java index ba767a8e35..2526f8e4b5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2PmservletTest.java index b23af78e1c..3ec89e62df 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery.jar"); @@ -179,12 +180,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2PuservletTest.java index c461cb4906..a1d0f47647 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_CriteriaQuery_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery.jar"); @@ -179,12 +180,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2Stateful3Test.java index 24e3cb0ff7..86983746c5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2Stateless3Test.java index 81215ee098..3540c821e5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3AppmanagedTest.java index 8ab8d2b11c..319c879171 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.jar"); // The class files @@ -127,17 +127,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.CriteriaQuery.Client3.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -208,12 +209,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3AppmanagednotxTest.java index 38ae72de05..50d0ba32d3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -127,17 +127,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.CriteriaQuery.Client3.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -208,12 +209,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3PmservletTest.java index 183d3889e9..ad20c1b7ca 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3PmservletTest.java @@ -112,6 +112,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery.jar"); @@ -180,12 +181,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3PuservletTest.java index 7e0a00dd84..1a95bba367 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3PuservletTest.java @@ -112,6 +112,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_CriteriaQuery_puservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery.jar"); @@ -180,12 +181,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3Stateful3Test.java index 4b30d958c8..2604423092 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.jar"); // The class files @@ -127,17 +127,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.CriteriaQuery.Client3.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -208,12 +209,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3Stateless3Test.java index 4ec035c5c0..1587650758 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.jar"); // The class files @@ -127,17 +127,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.CriteriaQuery.Client3.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -208,12 +209,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4AppmanagedTest.java index 95a4e6894e..8e00fe7fe2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4AppmanagednotxTest.java index b1c19d0840..4ea0842be4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4PmservletTest.java index 25a4fb62d4..b3b0654da2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery.jar"); @@ -179,12 +180,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4PuservletTest.java index a46d7a820c..0f89c62358 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_CriteriaQuery_puservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery.jar"); @@ -179,12 +180,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4Stateful3Test.java index 95f54ef6e5..3b9f3a25c1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4Stateless3Test.java index 008b7ba86a..c9f5c632b1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5AppmanagedTest.java index 1e1b0975c9..834f838a0d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client, Client5.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client5.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client5.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client5.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client5.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb, Client5.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb, Client5.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5AppmanagednotxTest.java index 265a38a345..a1c71fe4e8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client, Client5.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client5.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client5.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client5.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client5.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb, Client5.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb, Client5.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5PmservletTest.java index 60255c2c6c..49c7aea284 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web, Client5.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery.jar"); @@ -179,12 +180,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5PuservletTest.java index 886ef335df..ff4cbe74fe 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_CriteriaQuery_puservlet_vehicle_web, Client5.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery.jar"); @@ -179,12 +180,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5Stateful3Test.java index 2356e95b67..e72cd2f062 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client, Client5.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client5.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client5.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client5.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client5.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb, Client5.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb, Client5.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5Stateless3Test.java index bced4b423b..daa7185bd3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client, Client5.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client5.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client5.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client5.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client5.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb, Client5.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb, Client5.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6AppmanagedTest.java index 15d357a4b0..1fbcc85f38 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client, Client6.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client6.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client6.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client6.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client6.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb, Client6.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb, Client6.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6AppmanagednotxTest.java index f05b64d606..afcd9a3a79 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client, Client6.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client6.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client6.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client6.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client6.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb, Client6.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb, Client6.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6PmservletTest.java index 98d6852459..437192375c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web, Client6.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery.jar"); @@ -179,12 +180,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6PuservletTest.java index 28d9ed7626..d4c40e7638 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_CriteriaQuery_puservlet_vehicle_web, Client6.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery.jar"); @@ -179,12 +180,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6Stateful3Test.java index 0b6be561c4..cfaeb0f79f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client, Client6.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client6.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client6.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client6.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client6.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb, Client6.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb, Client6.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6Stateless3Test.java index dffbf6fd8c..b5e80378b1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client, Client6.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client6.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client6.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client6.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client6.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb, Client6.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb, Client6.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7AppmanagedTest.java index de0c556da1..13c78414f2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client, Client7.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client7.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client7.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client7.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client7.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb, Client7.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_ejb, Client7.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client7.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7AppmanagednotxTest.java index 3a1287fbfb..114060d528 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client, Client7.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client7.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client7.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client7.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client7.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb, Client7.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_ejb, Client7.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client7.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7PmservletTest.java index 7fceb2f043..0c8bf5f5b5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web, Client7.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery.jar"); @@ -179,12 +180,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client7.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7PuservletTest.java index 0df5926c28..4b00a12ea1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_CriteriaQuery_puservlet_vehicle_web, Client7.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery.jar"); @@ -179,12 +180,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client7.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7Stateful3Test.java index 6f7c835fe5..adccfa7f29 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client, Client7.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client7.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client7.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client7.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client7.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb, Client7.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_ejb, Client7.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client7.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7Stateless3Test.java index b9d20b0649..c862019242 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client, Client7.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client7.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client7.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client7.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client7.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb, Client7.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_ejb, Client7.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -207,12 +208,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/.ear.sun-application.xml"); + earResURL = Client7.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientAppmanagedTest.java index 3a1b94f695..51d515d35f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientAppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaUpdate_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaUpdate_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaUpdate_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaUpdate_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaUpdate_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaUpdate_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaUpdate_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaUpdate_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaUpdate_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaUpdate/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaUpdate_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaUpdate/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaUpdate_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientAppmanagednotxTest.java index 26b4ea993e..7c77416667 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientAppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaUpdate_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaUpdate_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaUpdate_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaUpdate_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaUpdate_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaUpdate_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaUpdate_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaUpdate_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaUpdate_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaUpdate/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaUpdate_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaUpdate/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaUpdate_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientPmservletTest.java index 74fdd7ffbf..f3334c395d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientPmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriapia_CriteriaUpdate_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaUpdate = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaUpdate.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaUpdate/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaUpdate_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaUpdate/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaUpdate_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientPuservletTest.java index 7712306091..3d409310f5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientPuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriapia_CriteriaUpdate_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaUpdate = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaUpdate.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaUpdate/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaUpdate_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaUpdate/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaUpdate_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientStateful3Test.java index 47ee7292bb..44a3331f37 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientStateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaUpdate_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaUpdate_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaUpdate_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaUpdate_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaUpdate_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaUpdate_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaUpdate_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaUpdate_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaUpdate_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaUpdate/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaUpdate_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaUpdate/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaUpdate_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientStateless3Test.java index 7e60f86235..7207ed25af 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientStateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaUpdate_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriapia_CriteriaUpdate_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaUpdate_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaUpdate_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaUpdate_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriapia_CriteriaUpdate_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriapia_CriteriaUpdate_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaUpdate_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriapia_CriteriaUpdate_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaUpdate/"); - if(earResURL != null) { - jpa_core_criteriapia_CriteriaUpdate_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaUpdate/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriapia_CriteriaUpdate_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1AppmanagedTest.java index a03d942fab..5980f9344d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1AppmanagednotxTest.java index 1d416c2f36..1192a00447 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1PmservletTest.java index 85c03d5abd..6adab4584d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_From_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1PuservletTest.java index ba9fafcc78..b26192e43f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_From_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1Stateful3Test.java index 1aced5cec2..10bdf511e8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1Stateless3Test.java index 01e73e3970..70e7937857 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2AppmanagedTest.java index 297d6609fe..6288a5e2d5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2AppmanagednotxTest.java index b886158f51..6ce3cdfaa4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2PmservletTest.java index 07ff38c025..c4e964755f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_From_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2PuservletTest.java index 86106fafca..54f316b54a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_From_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2Stateful3Test.java index 76a6318eae..a307f718b1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2Stateless3Test.java index 9648536fd7..b23702793c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3AppmanagedTest.java index 87cf592fa3..cc9b57c02f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_appmanaged_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_appmanaged_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_appmanaged_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3AppmanagednotxTest.java index 07f0142761..efa90da6c6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3PmservletTest.java index 59c1678f7a..d32d4f5384 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_From_pmservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3PuservletTest.java index 3129743184..8c68902fa3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_From_puservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3Stateful3Test.java index abc4c3483c..5c1832f2a6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_stateful3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_stateful3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_stateful3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3Stateless3Test.java index a2143c2ef2..75e25af102 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_stateless3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_stateless3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_stateless3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4AppmanagedTest.java index d061a90fe9..8c64b44a1d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_appmanaged_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_appmanaged_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_appmanaged_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4AppmanagednotxTest.java index b1d491ed3c..e9f99a8181 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4PmservletTest.java index a6772e97ce..f02532a992 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_From_pmservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4PuservletTest.java index 28a908a0d7..485e8dbf5f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_From_puservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4Stateful3Test.java index cb2263134c..2d47971ef4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_stateful3_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_stateful3_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_stateful3_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4Stateless3Test.java index 8e1b712b58..f9e8a8f9a4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_stateless3_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_From_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_From_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_From_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_stateless3_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_From_stateless3_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/From/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1AppmanagedTest.java index 878f2e6240..c7eb55dda0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.Join.Client1.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/"); - if(earResURL != null) { - jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1AppmanagednotxTest.java index 2c13a8da5d..9a68851b61 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.Join.Client1.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/"); - if(earResURL != null) { - jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1PmservletTest.java index 8ca34fded9..e67b5fe7ab 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_Join_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Join = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/"); - if(earResURL != null) { - jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1PuservletTest.java index 31540f9540..8b936a0e30 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_Join_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Join = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/"); - if(earResURL != null) { - jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1Stateful3Test.java index a3c4de061a..ad17eea8e7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Join_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.Join.Client1.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/"); - if(earResURL != null) { - jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1Stateless3Test.java index df2cd56b99..f40d348824 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Join_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.Join.Client1.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/"); - if(earResURL != null) { - jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2AppmanagedTest.java index 246aeeec3c..90078da52c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/"); - if(earResURL != null) { - jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2AppmanagednotxTest.java index 150b2ca95a..4ad6d978e9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/"); - if(earResURL != null) { - jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2PmservletTest.java index 66675dbc47..34fe4ddc7c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_Join_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Join = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/"); - if(earResURL != null) { - jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2PuservletTest.java index c469a26963..3f4f2bd511 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_Join_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Join = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/"); - if(earResURL != null) { - jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2Stateful3Test.java index b2798aed88..9fedd4545f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Join_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/"); - if(earResURL != null) { - jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2Stateless3Test.java index 0aa50f0754..ec16cfdb30 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Join_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/"); - if(earResURL != null) { - jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3AppmanagedTest.java index e72a357237..6acea25743 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_appmanaged_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_appmanaged_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/"); - if(earResURL != null) { - jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3AppmanagednotxTest.java index 327ed15163..f2a22905b6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/"); - if(earResURL != null) { - jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3PmservletTest.java index 8f9c6bdaad..292b557e65 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_Join_pmservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Join = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/"); - if(earResURL != null) { - jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3PuservletTest.java index 45a8ad036d..c1706748ec 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_Join_puservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Join = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/"); - if(earResURL != null) { - jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3Stateful3Test.java index db19a579cd..f70c9f9fa5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_stateful3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Join_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_stateful3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_stateful3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/"); - if(earResURL != null) { - jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3Stateless3Test.java index a9c7f049bb..6c5ae73e78 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_stateless3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Join_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Join_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Join_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_stateless3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Join_stateless3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/"); - if(earResURL != null) { - jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Join/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1AppmanagedTest.java index 135d616d21..da1781c355 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1AppmanagednotxTest.java index 161daf7441..6f061a02fd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1PmservletTest.java index ed97b5d761..5f320c878b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_Root_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1PuservletTest.java index c6b81c56f8..b0e2eb3775 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_Root_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1Stateful3Test.java index 49dc57ee61..53d17dcda2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1Stateless3Test.java index 29c021e4ae..907798499f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2AppmanagedTest.java index 043534c887..2509cf7a92 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2AppmanagednotxTest.java index ac3dc7e4fb..0d32476b7e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2PmservletTest.java index 8fba2f9c42..454d36abd3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_Root_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2PuservletTest.java index a2d502f8ee..64d613feb7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_Root_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2Stateful3Test.java index 1ade65140e..841682b20b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2Stateless3Test.java index b770c28d25..0fe2bb12e4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3AppmanagedTest.java index fc95a8e1bd..2e8bc7ccb3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_appmanaged_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3AppmanagednotxTest.java index 9bf11e5fa2..a65b890004 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3PmservletTest.java index c24b776385..aa32d3ea91 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_Root_pmservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3PuservletTest.java index 4b92a07186..14106daa15 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_Root_puservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3Stateful3Test.java index bb495a04c8..bf55ef8856 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_stateful3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_stateful3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_stateful3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3Stateless3Test.java index 47cb63e770..315cad0d5c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_stateless3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_stateless3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_stateless3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4AppmanagedTest.java index 394ab50408..0da9860c24 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_appmanaged_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_appmanaged_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4AppmanagednotxTest.java index 2eaff7b2fa..0844eb3f9e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4PmservletTest.java index 3ddcc7d3d0..103f498940 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_Root_pmservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4PuservletTest.java index 15818f66ee..dd7cedd13f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_Root_puservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4Stateful3Test.java index 6d6800b9a0..ef4e60f85a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_stateful3_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_stateful3_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_stateful3_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4Stateless3Test.java index 1a6ceb3f69..e48859e944 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_stateless3_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_Root_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_Root_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_Root_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_stateless3_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_Root_stateless3_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/"); - if(earResURL != null) { - jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/Root/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_Root_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1AppmanagedTest.java index 83c7441ca3..6bc6353d46 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.metamodelquery.Client1.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1AppmanagednotxTest.java index 690bfbdbc5..f44ef746e6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.metamodelquery.Client1.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1PmservletTest.java index 1ec9f4ec30..0556f0ce8b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_metamodelquery_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1PuservletTest.java index ee2dd56930..84ad21cb84 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_metamodelquery_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1Stateful3Test.java index 030c6d4e36..fd078b80d5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.metamodelquery.Client1.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1Stateless3Test.java index 27c7348922..3bc133c3dc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.metamodelquery.Client1.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2AppmanagedTest.java index ee1427399d..3faeab4ce7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2AppmanagednotxTest.java index 94ab7c5228..329923934b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2PmservletTest.java index 94829c5226..b5af9da2a4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_metamodelquery_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2PuservletTest.java index e7f4dfc288..4547264a3f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_metamodelquery_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2Stateful3Test.java index 7fc376c898..6f83e65b84 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2Stateless3Test.java index 373220c14b..94967d9dbb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3AppmanagedTest.java index 0605adc0f0..f78340640f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3AppmanagednotxTest.java index ce99c5ef52..5948a2de57 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3PmservletTest.java index cec84a402b..34871104ed 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_metamodelquery_pmservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3PuservletTest.java index 4bfc98c76d..49cde8cafc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_metamodelquery_puservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3Stateful3Test.java index 5190b9f378..656e5c3045 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3Stateless3Test.java index 993b1e9c4e..7d3b6dcf08 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4AppmanagedTest.java index af319572e0..6ff3854347 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4AppmanagednotxTest.java index 6a88bcf9fe..d3e70facef 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4PmservletTest.java index 363aef6a18..cb968caa27 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_metamodelquery_pmservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4PuservletTest.java index f83926469a..22d7146a2d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_metamodelquery_puservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4Stateful3Test.java index 011cd47f14..4abeba5629 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4Stateless3Test.java index ed4fe30a10..b282edf332 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5AppmanagedTest.java index d56f3d6347..539ba391e3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client, Client5.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client5.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client5.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client5.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client5.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb, Client5.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb, Client5.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5AppmanagednotxTest.java index 680b7f425e..5c9249292e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client, Client5.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client5.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client5.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client5.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client5.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb, Client5.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb, Client5.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5PmservletTest.java index 054b2d71ef..9bfd4a4399 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_metamodelquery_pmservlet_vehicle_web, Client5.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5PuservletTest.java index 91d6730432..e5bd1e4f43 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_metamodelquery_puservlet_vehicle_web, Client5.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5Stateful3Test.java index e170d071d2..567fbddbe1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client, Client5.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client5.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client5.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client5.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client5.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb, Client5.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb, Client5.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5Stateless3Test.java index 3ea9f140be..8a2dbaa727 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client, Client5.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client5.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client5.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client5.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client5.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb, Client5.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb, Client5.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6AppmanagedTest.java index fc78ea9046..def394feb2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client, Client6.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client6.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client6.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client6.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client6.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb, Client6.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb, Client6.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6AppmanagednotxTest.java index 65131edf4f..5291d0fe75 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client, Client6.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client6.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client6.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client6.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client6.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb, Client6.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb, Client6.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6PmservletTest.java index f528e7e8d0..0801090004 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_metamodelquery_pmservlet_vehicle_web, Client6.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6PuservletTest.java index 560313fdd3..fb517641d4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_metamodelquery_puservlet_vehicle_web, Client6.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6Stateful3Test.java index 355d3c292a..ef47eb7b2c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client, Client6.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client6.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client6.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client6.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client6.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb, Client6.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb, Client6.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6Stateless3Test.java index a437f27a29..c1b30768ef 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client, Client6.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client6.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client6.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client6.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client6.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb, Client6.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb, Client6.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7AppmanagedTest.java index 758704030b..01fd44785b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client, Client7.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client7.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client7.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client7.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client7.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb, Client7.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_ejb, Client7.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client7.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7AppmanagednotxTest.java index de2ce63c8a..e600a23101 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client, Client7.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client7.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client7.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client7.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client7.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb, Client7.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_ejb, Client7.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client7.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7PmservletTest.java index 0b3f6d3f9a..8779a42940 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_metamodelquery_pmservlet_vehicle_web, Client7.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client7.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7PuservletTest.java index 0fe9045f51..30cf1aeccf 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_metamodelquery_puservlet_vehicle_web, Client7.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client7.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7Stateful3Test.java index 651cc8d4e6..a7979b5dc4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client, Client7.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client7.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client7.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client7.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client7.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb, Client7.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_ejb, Client7.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client7.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7Stateless3Test.java index 3e71a49ccf..199edc33ed 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client, Client7.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client7.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client7.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client7.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client7.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb, Client7.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_ejb, Client7.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client7.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/.ear.sun-application.xml"); + earResURL = Client7.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1AppmanagedTest.java index 60cdd80073..62663cae3f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/"); - if(earResURL != null) { - jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1AppmanagednotxTest.java index 813be9e170..7bcb42532b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/"); - if(earResURL != null) { - jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1PmservletTest.java index b7d787a2d7..33b5227122 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_misc_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_misc = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/"); - if(earResURL != null) { - jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1PuservletTest.java index 521e8ccfd6..93f4703117 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_misc_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_misc = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/"); - if(earResURL != null) { - jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1Stateful3Test.java index be9b4a0a02..688d24cd24 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_misc_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/"); - if(earResURL != null) { - jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1Stateless3Test.java index bbf5b76f5f..2471e61ac3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_misc_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/"); - if(earResURL != null) { - jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2AppmanagedTest.java index c0803e9456..70c9b1b371 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/"); - if(earResURL != null) { - jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2AppmanagednotxTest.java index 5310197a9f..85e920e97d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/"); - if(earResURL != null) { - jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2PmservletTest.java index c4bb0533f5..902c5195a8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_misc_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_misc = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/"); - if(earResURL != null) { - jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2PuservletTest.java index 728e698225..a91ec5b303 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_misc_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_misc = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/"); - if(earResURL != null) { - jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2Stateful3Test.java index 1443762acb..01aef8d7c1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_misc_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/"); - if(earResURL != null) { - jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2Stateless3Test.java index ebc0a27954..4bf715af4b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_misc_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/"); - if(earResURL != null) { - jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3AppmanagedTest.java index cc10560611..8e0a55dd10 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_appmanaged_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_appmanaged_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/"); - if(earResURL != null) { - jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3AppmanagednotxTest.java index e61de746d3..5ae45426fc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/"); - if(earResURL != null) { - jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3PmservletTest.java index aff4b42dbd..5d67486b7d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_misc_pmservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_misc = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/"); - if(earResURL != null) { - jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3PuservletTest.java index a0b764728f..57700c550c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_misc_puservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_misc = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/"); - if(earResURL != null) { - jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3Stateful3Test.java index ca42ad2b34..c2b790ce5b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_stateful3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_misc_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_stateful3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_stateful3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/"); - if(earResURL != null) { - jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3Stateless3Test.java index 0d046c23f3..1930c75d00 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_stateless3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_misc_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_misc_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_misc_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_stateless3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_misc_stateless3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/"); - if(earResURL != null) { - jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/misc/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1AppmanagedTest.java index 021c942fd0..e38beffd87 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1AppmanagedTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_parameter_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_parameter_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_parameter_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_parameter_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_parameter_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_parameter_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_parameter_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_parameter_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/"); - if(earResURL != null) { - jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1AppmanagednotxTest.java index d346230c9a..b77e51aaca 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1AppmanagednotxTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/"); - if(earResURL != null) { - jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1PmservletTest.java index 9141e1f1c2..17c6045d7c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class ); // The web.xml descriptor URL warResURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_parameter_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_parameter = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter.jar"); @@ -143,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/"); - if(earResURL != null) { - jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1PuservletTest.java index fcfb717105..1b8ccffb4d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class ); // The web.xml descriptor URL warResURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_parameter_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_parameter = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter.jar"); @@ -143,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/"); - if(earResURL != null) { - jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1Stateful3Test.java index e87eb6e177..f9386b3b7b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1Stateful3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_parameter_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_parameter_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_parameter_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_parameter_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_parameter_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_parameter_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_parameter_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_parameter_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/"); - if(earResURL != null) { - jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1Stateless3Test.java index a1fa879801..293c3dbb22 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1Stateless3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_parameter_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_parameter_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_parameter_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_parameter_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_parameter_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_parameter_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_parameter_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_parameter_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/"); - if(earResURL != null) { - jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2AppmanagedTest.java index bd2a8e8db4..1b83ede4a6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2AppmanagedTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_parameter_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_parameter_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_parameter_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_parameter_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_parameter_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_parameter_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_parameter_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_parameter_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/"); - if(earResURL != null) { - jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2AppmanagednotxTest.java index e2d54af3c4..c2230ce965 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2AppmanagednotxTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/"); - if(earResURL != null) { - jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2PmservletTest.java index 7bd9f4ba8f..3affe927ac 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class ); // The web.xml descriptor URL warResURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_parameter_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_parameter = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter.jar"); @@ -143,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/"); - if(earResURL != null) { - jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2PuservletTest.java index 044f00a114..2d1fe4aeb2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class ); // The web.xml descriptor URL warResURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_parameter_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_parameter = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter.jar"); @@ -143,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/"); - if(earResURL != null) { - jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2Stateful3Test.java index 7f9e429074..198375aefe 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2Stateful3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_parameter_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_parameter_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_parameter_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_parameter_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_parameter_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_parameter_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_parameter_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_parameter_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/"); - if(earResURL != null) { - jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2Stateless3Test.java index 6bc89bd759..81d091e705 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2Stateless3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_parameter_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_parameter_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_parameter_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_parameter_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_parameter_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_parameter_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_parameter_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_parameter_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/"); - if(earResURL != null) { - jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/parameter/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1AppmanagedTest.java index 5057b4baf3..25a0c83b4e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1AppmanagednotxTest.java index 7f44a0655e..cdcb9f14b8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1PmservletTest.java index 0a0d598553..b9cc974f6c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_strquery_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1PuservletTest.java index e61f1034bd..5006edad2e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_strquery_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1Stateful3Test.java index 31b76b811e..5ee53dd71e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1Stateless3Test.java index 8b5641f075..c336e0190e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2AppmanagedTest.java index ebed02eadb..047274f9a4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2AppmanagednotxTest.java index 56f63829d9..dd26570b5e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2PmservletTest.java index bae1aacbaf..90bcd2892b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_strquery_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2PuservletTest.java index 5bc30f5795..4b3ade08ff 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_strquery_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2Stateful3Test.java index a8abf3297f..39c30f277a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2Stateless3Test.java index 161592240c..3793fec9c9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3AppmanagedTest.java index 1ee4c55138..e7f22238f1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_appmanaged_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3AppmanagednotxTest.java index bb7f252b21..f7f7ca62fa 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3PmservletTest.java index d3e6b2619a..e3de268410 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_strquery_pmservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3PuservletTest.java index 7eba167e01..2f5bf1b565 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_strquery_puservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3Stateful3Test.java index a9738eb4d8..bc8d65eea3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_stateful3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3Stateless3Test.java index 8446d0bd39..756c619b4c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_stateless3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4AppmanagedTest.java index a69d903c5f..d4474d1ab3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_appmanaged_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4AppmanagednotxTest.java index 641e7f41e3..b53e955860 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4PmservletTest.java index 578949a9b2..660b1ab549 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_strquery_pmservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4PuservletTest.java index aef0f3ba53..5f891e4206 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_strquery_puservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4Stateful3Test.java index 8eacbc66fa..75e2cc4021 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_stateful3_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4Stateless3Test.java index d140397ebb..9824a5a169 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_stateless3_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5AppmanagedTest.java index b3afd2cfa0..1e429d3e7e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_appmanaged_vehicle_client, Client5.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.strquery.Client5.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client5.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client5.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client5.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client5.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb, Client5.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_appmanaged_vehicle_ejb, Client5.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5AppmanagednotxTest.java index 0e5d5d20a9..7ff1d95445 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client, Client5.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client5.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client5.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client5.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client5.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb, Client5.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_ejb, Client5.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5PmservletTest.java index 4173c397be..e5287dcb88 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_strquery_pmservlet_vehicle_web, Client5.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5PuservletTest.java index 37cb0089e2..8a27ef3977 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_criteriaapi_strquery_puservlet_vehicle_web, Client5.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery.jar"); @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5Stateful3Test.java index 5635d2bb18..ec0914686f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_stateful3_vehicle_client, Client5.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.strquery.Client5.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client5.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client5.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client5.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client5.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb, Client5.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_stateful3_vehicle_ejb, Client5.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5Stateless3Test.java index a8576a4ca3..51187345f7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_stateless3_vehicle_client, Client5.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.strquery.Client5.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client5.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client5.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client5.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client5.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb, Client5.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_criteriaapi_strquery_stateless3_vehicle_ejb, Client5.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -206,12 +207,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/"); - if(earResURL != null) { - jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/criteriaapi/strquery/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_criteriaapi_strquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientAppmanagedTest.java index f72d2e1d27..0cfae830aa 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex1a_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex1a_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1a_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex1a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex1a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex1a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex1a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex1a_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex1a_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex1a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex1a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientAppmanagednotxTest.java index 48b59da908..fbc49d43e2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex1a_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex1a_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1a_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex1a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex1a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex1a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex1a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex1a_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex1a_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex1a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex1a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientPmservletTest.java index 737ecc8c0c..cc77eccf61 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex1a_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex1a = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1a.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex1a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex1a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientPuservletTest.java index 9f4c127fd6..760647aa88 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex1a_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex1a = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1a.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex1a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex1a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientStateful3Test.java index 1e4e63be70..28cdff8c11 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex1a_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex1a_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1a_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex1a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex1a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex1a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex1a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex1a_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex1a_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex1a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex1a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientStateless3Test.java index 9ebd522aa3..90eaa206fb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex1a_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex1a_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1a_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex1a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex1a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex1a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex1a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex1a_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex1a_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex1a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex1a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientAppmanagedTest.java index a2451c905b..b3e3a2f452 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex1b_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex1b_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1b_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex1b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex1b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex1b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex1b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex1b_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex1b_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex1b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex1b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientAppmanagednotxTest.java index ed6f0837ed..d6824012a8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex1b_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex1b_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1b_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex1b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex1b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex1b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex1b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex1b_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex1b_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex1b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex1b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientPmservletTest.java index 376d26e97c..61511387db 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex1b_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex1b = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1b.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex1b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex1b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientPuservletTest.java index caa0127e3c..0e846b69a8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex1b_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex1b = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1b.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex1b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex1b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientStateful3Test.java index 2f7d16e42c..b583f85e5e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex1b_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex1b_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1b_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex1b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex1b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex1b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex1b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex1b_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex1b_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex1b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex1b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientStateless3Test.java index 3cda548068..0d94b9f45f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex1b_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex1b_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1b_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex1b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex1b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex1b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex1b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex1b_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex1b_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex1b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex1b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex1b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientAppmanagedTest.java index a5aad204a4..0c5a49492c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex2a_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex2a_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2a_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex2a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex2a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex2a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex2a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex2a_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex2a_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex2a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex2a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientAppmanagednotxTest.java index 3f2585b6c8..3007d4c2ac 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex2a_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex2a_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2a_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex2a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex2a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex2a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex2a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex2a_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex2a_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex2a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex2a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientPmservletTest.java index ea08b52463..77c6af3dfe 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex2a_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex2a = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2a.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex2a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex2a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientPuservletTest.java index c725f599f2..f576150dec 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex2a_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex2a = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2a.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex2a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex2a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientStateful3Test.java index 169fba54bf..dee33b3fdf 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex2a_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex2a_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2a_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex2a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex2a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex2a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex2a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex2a_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex2a_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex2a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex2a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientStateless3Test.java index 69ee28a195..b879a24da5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex2a_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex2a_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2a_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex2a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex2a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex2a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex2a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex2a_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex2a_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex2a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex2a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientAppmanagedTest.java index c99abdc8bf..2b48bac6d2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex2b_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex2b_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2b_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex2b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex2b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex2b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex2b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex2b_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex2b_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex2b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex2b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientAppmanagednotxTest.java index 028cb49841..196f16a85c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex2b_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex2b_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2b_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex2b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex2b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex2b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex2b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex2b_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex2b_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex2b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex2b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientPmservletTest.java index 9ce7ee29a7..8c868b4ab6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex2b_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex2b = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2b.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex2b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex2b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientPuservletTest.java index 25a34666dd..fb46fc39ec 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex2b_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex2b = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2b.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex2b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex2b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientStateful3Test.java index c321d08b46..d6346fa789 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex2b_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex2b_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2b_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex2b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex2b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex2b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex2b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex2b_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex2b_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex2b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex2b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientStateless3Test.java index 5fb38d07f4..b6bfda3df6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex2b_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex2b_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2b_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex2b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex2b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex2b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex2b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex2b_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex2b_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex2b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex2b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex2b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientAppmanagedTest.java index b34635e51d..41d50e94ce 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex3a_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex3a_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3a_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex3a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex3a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex3a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex3a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex3a_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex3a_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex3a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex3a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientAppmanagednotxTest.java index e0c4294ff1..0a76d807d8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex3a_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex3a_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3a_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex3a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex3a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex3a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex3a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex3a_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex3a_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex3a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex3a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientPmservletTest.java index acde472c91..58972a6323 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex3a_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex3a = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3a.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex3a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex3a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientPuservletTest.java index e6b65596d2..245a6c31ad 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex3a_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex3a = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3a.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex3a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex3a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientStateful3Test.java index 0bb32128ce..78ff220334 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex3a_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex3a_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3a_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex3a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex3a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex3a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex3a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex3a_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex3a_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex3a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex3a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientStateless3Test.java index da7067b499..38d56954e8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex3a_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex3a_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3a_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex3a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex3a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex3a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex3a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex3a_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex3a_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex3a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex3a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientAppmanagedTest.java index bfc985c615..af506c43ca 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex3b_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex3b_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3b_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex3b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex3b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex3b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex3b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex3b_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex3b_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex3b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex3b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientAppmanagednotxTest.java index a69390ba4f..67579e8a56 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex3b_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex3b_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3b_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex3b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex3b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex3b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex3b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex3b_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex3b_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex3b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex3b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientPmservletTest.java index 8b10ecd057..3929f06533 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex3b_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex3b = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3b.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex3b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex3b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientPuservletTest.java index 417ea78cf3..d4ca891984 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex3b_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex3b = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3b.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex3b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex3b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientStateful3Test.java index 90b97f9fb8..4ab571eae1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex3b_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex3b_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3b_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex3b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex3b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex3b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex3b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex3b_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex3b_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex3b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex3b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientStateless3Test.java index 2a36bc82ff..8618a09119 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex3b_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex3b_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3b_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex3b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex3b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex3b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex3b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex3b_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex3b_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex3b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex3b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex3b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientAppmanagedTest.java index e92f5c2c96..401b04280f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex4a_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex4a_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4a_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex4a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex4a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex4a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex4a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex4a_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex4a_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex4a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex4a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientAppmanagednotxTest.java index 7207456ab9..1d7235f226 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex4a_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex4a_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4a_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex4a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex4a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex4a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex4a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex4a_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex4a_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex4a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex4a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientPmservletTest.java index 320af17f39..ca31fd2bde 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex4a_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex4a = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4a.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex4a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex4a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientPuservletTest.java index c9e89df18f..717eaa13d0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex4a_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex4a = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4a.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex4a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex4a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientStateful3Test.java index 8217b9e88d..cf2ef3b8e9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex4a_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex4a_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4a_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex4a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex4a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex4a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex4a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex4a_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex4a_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex4a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex4a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientStateless3Test.java index 091ba505fa..6071ea885e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex4a_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex4a_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4a_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex4a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex4a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex4a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex4a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex4a_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex4a_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex4a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex4a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientAppmanagedTest.java index c6ba5e8e77..eebe9288a9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex4b_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex4b_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4b_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex4b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex4b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex4b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex4b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex4b_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex4b_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex4b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex4b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientAppmanagednotxTest.java index 30d7ad702e..6558486d5c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex4b_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex4b_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4b_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex4b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex4b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex4b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex4b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex4b_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex4b_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex4b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex4b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientPmservletTest.java index a8a5b946fb..505e04ffaf 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex4b_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex4b = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4b.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex4b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex4b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientPuservletTest.java index a6dbd4212d..43f6c445ab 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex4b_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex4b = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4b.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex4b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex4b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientStateful3Test.java index f202685de7..efad0704d6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex4b_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex4b_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4b_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex4b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex4b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex4b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex4b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex4b_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex4b_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex4b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex4b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientStateless3Test.java index 91fac90608..c6616cfb89 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex4b_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex4b_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4b_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex4b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex4b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex4b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex4b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex4b_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex4b_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex4b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex4b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex4b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientAppmanagedTest.java index 47b7b30373..db057da7c9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex5a_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex5a_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5a_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex5a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex5a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex5a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex5a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex5a_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex5a_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex5a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex5a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientAppmanagednotxTest.java index ca48fd786b..60aad7ee66 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex5a_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex5a_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5a_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex5a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex5a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex5a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex5a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex5a_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex5a_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex5a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex5a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientPmservletTest.java index 8b6893be3f..8356c941c5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex5a_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex5a = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5a.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex5a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex5a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientPuservletTest.java index fbc95b625e..0e1359b6cc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex5a_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex5a = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5a.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex5a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex5a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientStateful3Test.java index 05434b2d54..80e53e5b66 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex5a_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex5a_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5a_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex5a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex5a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex5a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex5a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex5a_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex5a_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex5a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex5a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientStateless3Test.java index fe81c48caa..8fef883d76 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex5a_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex5a_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5a_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex5a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex5a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex5a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex5a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex5a_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex5a_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex5a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex5a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientAppmanagedTest.java index 48c82a8e52..7fd87dd017 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex5b_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex5b_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5b_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.derivedid.ex5b.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex5b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex5b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex5b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex5b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex5b_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex5b_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex5b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex5b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientAppmanagednotxTest.java index b20818ac97..62d319b60a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex5b_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex5b_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5b_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.derivedid.ex5b.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex5b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex5b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex5b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex5b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex5b_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex5b_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex5b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex5b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPmservletTest.java index 73b128f86b..95e3d61b95 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex5b_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex5b = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5b.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex5b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex5b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPuservletTest.java index c818352171..2814b37bab 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex5b_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex5b = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5b.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex5b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex5b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientStateful3Test.java index 53678b1fd9..4c2051438b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex5b_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex5b_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5b_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.derivedid.ex5b.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex5b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex5b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex5b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex5b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex5b_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex5b_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex5b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex5b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientStateless3Test.java index 1c4e86ebcd..aa920de491 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex5b_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex5b_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5b_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.derivedid.ex5b.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex5b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex5b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex5b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex5b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex5b_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex5b_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex5b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex5b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex5b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientAppmanagedTest.java index b2dedb0a1f..93e6da2310 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex6a_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex6a_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6a_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex6a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex6a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex6a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex6a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex6a_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex6a_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex6a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex6a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientAppmanagednotxTest.java index d8f27dfa02..8d312571da 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex6a_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex6a_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6a_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex6a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex6a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex6a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex6a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex6a_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex6a_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex6a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex6a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientPmservletTest.java index acdf66b9a8..91cd721b7b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex6a_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex6a = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6a.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex6a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex6a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientPuservletTest.java index 97448d1f51..c0cf00a3e4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex6a_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex6a = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6a.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex6a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex6a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientStateful3Test.java index 190369a5bd..68adf31f45 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex6a_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex6a_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6a_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex6a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex6a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex6a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex6a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex6a_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex6a_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex6a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex6a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientStateless3Test.java index f0a79fc684..5818996445 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex6a_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex6a_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6a_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex6a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex6a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex6a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex6a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex6a_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex6a_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6a/"); - if(earResURL != null) { - jpa_core_deriverdid_ex6a_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6a/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex6a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientAppmanagedTest.java index a18c74ec29..e71a6ad94f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex6b_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex6b_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6b_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex6b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex6b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex6b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex6b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex6b_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex6b_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex6b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex6b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientAppmanagednotxTest.java index b58f9f707c..b267334c0f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex6b_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex6b_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6b_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex6b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex6b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex6b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex6b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex6b_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex6b_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex6b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex6b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientPmservletTest.java index 9239ca8407..c3c417a22c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex6b_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex6b = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6b.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex6b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex6b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientPuservletTest.java index 377dfa7302..c3c9e9137f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_deriverdid_ex6b_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex6b = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6b.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex6b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex6b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientStateful3Test.java index 26fc28dbbb..568cb3b27c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex6b_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex6b_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6b_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex6b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex6b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex6b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex6b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex6b_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex6b_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex6b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex6b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientStateless3Test.java index 24532261ca..af6c2ca458 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex6b_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_deriverdid_ex6b_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6b_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex6b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex6b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_deriverdid_ex6b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_deriverdid_ex6b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex6b_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_deriverdid_ex6b_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6b/"); - if(earResURL != null) { - jpa_core_deriverdid_ex6b_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/derivedid/ex6b/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_deriverdid_ex6b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1AppmanagedTest.java index 3a1c20eae0..b8fe11ea36 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1AppmanagedTest.java @@ -131,7 +131,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManager_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_appmanaged_vehicle_ejb.jar"); // The class files @@ -156,17 +156,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManager_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManager_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -203,12 +204,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/"); - if(earResURL != null) { - jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1AppmanagednotxTest.java index 3faf19500d..42ca634344 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1AppmanagednotxTest.java @@ -131,7 +131,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManager_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -156,17 +156,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManager_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManager_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -203,12 +204,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/"); - if(earResURL != null) { - jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1PmservletTest.java index aadf7c2f07..b02e93aaf8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1PmservletTest.java @@ -142,6 +142,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entityManager_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entityManager = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager.jar"); @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/"); - if(earResURL != null) { - jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1PuservletTest.java index d70735a04f..afd286392c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1PuservletTest.java @@ -142,6 +142,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entityManager_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entityManager = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager.jar"); @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/"); - if(earResURL != null) { - jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1Stateful3Test.java index da37d03363..b4a6cfa1b9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1Stateful3Test.java @@ -131,7 +131,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManager_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_stateful3_vehicle_ejb.jar"); // The class files @@ -156,17 +156,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManager_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManager_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -203,12 +204,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/"); - if(earResURL != null) { - jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1Stateless3Test.java index 397536fd07..a61e8450b7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1Stateless3Test.java @@ -131,7 +131,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManager_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_stateless3_vehicle_ejb.jar"); // The class files @@ -156,17 +156,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManager_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManager_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -203,12 +204,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/"); - if(earResURL != null) { - jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2AppmanagedTest.java index 1076b9866f..7b507ca147 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2AppmanagedTest.java @@ -131,7 +131,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManager_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_appmanaged_vehicle_ejb.jar"); // The class files @@ -156,17 +156,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManager_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManager_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -203,12 +204,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/"); - if(earResURL != null) { - jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2AppmanagednotxTest.java index 87de7e45a2..307ae3a16f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2AppmanagednotxTest.java @@ -131,7 +131,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManager_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -156,17 +156,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManager_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManager_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -203,12 +204,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/"); - if(earResURL != null) { - jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2PmservletTest.java index 4d85616ad8..252920c4c4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2PmservletTest.java @@ -142,6 +142,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entityManager_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entityManager = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager.jar"); @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/"); - if(earResURL != null) { - jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2PuservletTest.java index 585f3ad8d2..b778ac9c57 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2PuservletTest.java @@ -142,6 +142,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entityManager_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entityManager = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager.jar"); @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/"); - if(earResURL != null) { - jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2Stateful3Test.java index aa12097c8a..25094c0f6c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2Stateful3Test.java @@ -131,7 +131,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManager_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_stateful3_vehicle_ejb.jar"); // The class files @@ -156,17 +156,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManager_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManager_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -203,12 +204,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/"); - if(earResURL != null) { - jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2Stateless3Test.java index 0bb6de8a46..a7819837e6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2Stateless3Test.java @@ -131,7 +131,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManager_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_stateless3_vehicle_ejb.jar"); // The class files @@ -156,17 +156,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManager_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManager_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -203,12 +204,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/"); - if(earResURL != null) { - jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3AppmanagedTest.java index 1466be0587..d659619a0d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3AppmanagedTest.java @@ -131,7 +131,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_appmanaged_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManager_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_appmanaged_vehicle_ejb.jar"); // The class files @@ -156,17 +156,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManager_appmanaged_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManager_appmanaged_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -203,12 +204,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/"); - if(earResURL != null) { - jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3AppmanagednotxTest.java index 09ca4a22e3..0d699d9c27 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3AppmanagednotxTest.java @@ -131,7 +131,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_appmanagedNoTx_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManager_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -156,17 +156,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManager_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManager_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -203,12 +204,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/"); - if(earResURL != null) { - jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3PmservletTest.java index c4074e8f92..a70545b999 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3PmservletTest.java @@ -142,6 +142,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entityManager_pmservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entityManager = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager.jar"); @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/"); - if(earResURL != null) { - jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3PuservletTest.java index 26d4bb169e..2aaf8e60f2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3PuservletTest.java @@ -142,6 +142,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entityManager_puservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entityManager = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager.jar"); @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/"); - if(earResURL != null) { - jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3Stateful3Test.java index 87b9093286..0f959879f1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3Stateful3Test.java @@ -131,7 +131,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_stateful3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManager_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_stateful3_vehicle_ejb.jar"); // The class files @@ -156,17 +156,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManager_stateful3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManager_stateful3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -203,12 +204,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/"); - if(earResURL != null) { - jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3Stateless3Test.java index 7db9f68626..244489f4a0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3Stateless3Test.java @@ -131,7 +131,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_stateless3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManager_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_stateless3_vehicle_ejb.jar"); // The class files @@ -156,17 +156,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManager_stateless3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManager_stateless3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -203,12 +204,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/"); - if(earResURL != null) { - jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManager/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1AppmanagednotxTest.java index 52a3db752e..d18ebf62d1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1AppmanagednotxTest.java @@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager2_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManager2_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager2_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -120,17 +120,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManager2_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager2_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManager2_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager2_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManager2_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManager2_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -168,12 +169,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManager2/"); - if(earResURL != null) { - jpa_core_entityManager2_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManager2/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager2_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1PmservletTest.java index 653497812d..5a6bbaea8a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1PmservletTest.java @@ -106,6 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entityManager2_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entityManager2 = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager2.jar"); @@ -141,12 +142,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManager2/"); - if(earResURL != null) { - jpa_core_entityManager2_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManager2/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager2_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1PuservletTest.java index d1de783df3..7cc0db0cb4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1PuservletTest.java @@ -106,6 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entityManager2_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entityManager2 = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager2.jar"); @@ -141,12 +142,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManager2/"); - if(earResURL != null) { - jpa_core_entityManager2_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManager2/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager2_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1Stateless3Test.java index 6fa6d5e74a..0eb4520f97 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1Stateless3Test.java @@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager2_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManager2_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager2_stateless3_vehicle_ejb.jar"); // The class files @@ -120,17 +120,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManager2_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager2_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManager2_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager2_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManager2_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManager2_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -168,12 +169,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManager2/"); - if(earResURL != null) { - jpa_core_entityManager2_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManager2/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager2_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2AppmanagednotxTest.java index 849fd0d175..9ce8a3a202 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2AppmanagednotxTest.java @@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager2_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManager2_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager2_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -120,17 +120,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManager2_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager2_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManager2_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager2_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManager2_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManager2_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -168,12 +169,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManager2/"); - if(earResURL != null) { - jpa_core_entityManager2_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManager2/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager2_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2PmservletTest.java index d3dc00a578..684a0e62dd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2PmservletTest.java @@ -106,6 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entityManager2_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entityManager2 = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager2.jar"); @@ -141,12 +142,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManager2/"); - if(earResURL != null) { - jpa_core_entityManager2_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManager2/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager2_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2PuservletTest.java index 87d0108cec..00bf5ee1c9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2PuservletTest.java @@ -106,6 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entityManager2_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entityManager2 = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager2.jar"); @@ -141,12 +142,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManager2/"); - if(earResURL != null) { - jpa_core_entityManager2_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManager2/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager2_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2Stateless3Test.java index 69da41d63c..23456bd63a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2Stateless3Test.java @@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager2_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManager2_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager2_stateless3_vehicle_ejb.jar"); // The class files @@ -120,17 +120,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManager2_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager2_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManager2_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManager2_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManager2_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManager2_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -168,12 +169,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManager2/"); - if(earResURL != null) { - jpa_core_entityManager2_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManager2/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManager2_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1AppmanagedTest.java index 09e8be73f5..e9706a306b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1AppmanagedTest.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManagerFactory_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_appmanaged_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -185,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/"); - if(earResURL != null) { - jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1AppmanagednotxTest.java index 2646362924..2fbf260595 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1AppmanagednotxTest.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -185,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/"); - if(earResURL != null) { - jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1PmservletTest.java index be23212f90..1ed9d42b3c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1PmservletTest.java @@ -122,6 +122,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entityManagerFactory_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entityManagerFactory = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory.jar"); @@ -158,12 +159,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/"); - if(earResURL != null) { - jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1PuservletTest.java index bac4405422..bb3903c269 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1PuservletTest.java @@ -122,6 +122,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entityManagerFactory_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entityManagerFactory = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory.jar"); @@ -158,12 +159,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/"); - if(earResURL != null) { - jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1Stateful3Test.java index 4779ad66a0..ba8db9668e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1Stateful3Test.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManagerFactory_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_stateful3_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -185,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/"); - if(earResURL != null) { - jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1Stateless3Test.java index b719b37630..2fccbd4ef9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1Stateless3Test.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManagerFactory_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_stateless3_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -185,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/"); - if(earResURL != null) { - jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2AppmanagedTest.java index 4c856b7400..13ad560a43 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2AppmanagedTest.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManagerFactory_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_appmanaged_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -185,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/"); - if(earResURL != null) { - jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2AppmanagednotxTest.java index de636a1f15..40a6378c55 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2AppmanagednotxTest.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -185,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/"); - if(earResURL != null) { - jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2PmservletTest.java index 1c08fd3edd..e63754c9a1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2PmservletTest.java @@ -122,6 +122,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entityManagerFactory_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entityManagerFactory = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory.jar"); @@ -158,12 +159,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/"); - if(earResURL != null) { - jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2PuservletTest.java index dbbf58e93b..bea544fe7f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2PuservletTest.java @@ -122,6 +122,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entityManagerFactory_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entityManagerFactory = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory.jar"); @@ -158,12 +159,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/"); - if(earResURL != null) { - jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2Stateful3Test.java index 760ff39ba9..9d854fee0c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2Stateful3Test.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManagerFactory_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_stateful3_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -185,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/"); - if(earResURL != null) { - jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2Stateless3Test.java index a8a7f308ec..5d73b25cf2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2Stateless3Test.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManagerFactory_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_stateless3_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -185,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/"); - if(earResURL != null) { - jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3AppmanagedTest.java index 9a6d10ffec..9cb59699d5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3AppmanagedTest.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_appmanaged_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManagerFactory_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_appmanaged_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_appmanaged_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_appmanaged_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -185,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/"); - if(earResURL != null) { - jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3AppmanagednotxTest.java index c85235ba18..917b1a4c94 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3AppmanagednotxTest.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -185,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/"); - if(earResURL != null) { - jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3PmservletTest.java index 12d07ea19d..3e089772fd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3PmservletTest.java @@ -122,6 +122,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entityManagerFactory_pmservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entityManagerFactory = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory.jar"); @@ -158,12 +159,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/"); - if(earResURL != null) { - jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3PuservletTest.java index 793eb84836..a7d129ada6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3PuservletTest.java @@ -122,6 +122,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entityManagerFactory_puservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entityManagerFactory = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory.jar"); @@ -158,12 +159,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/"); - if(earResURL != null) { - jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3Stateful3Test.java index f15c7ba238..f95658f935 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3Stateful3Test.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_stateful3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManagerFactory_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_stateful3_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_stateful3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_stateful3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -185,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/"); - if(earResURL != null) { - jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3Stateless3Test.java index 48dc000732..73c5db0379 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3Stateless3Test.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_stateless3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManagerFactory_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_stateless3_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactory_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactory_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_stateless3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManagerFactory_stateless3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -185,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/"); - if(earResURL != null) { - jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactory/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientAppmanagedTest.java index f7dc9b9254..2e7ae6ef0a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactoryCloseException_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManagerFactoryCloseException_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactoryCloseException_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactoryCloseException_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactoryCloseException_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactoryCloseException_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactoryCloseException_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManagerFactoryCloseException_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManagerFactoryCloseException_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Ear EnterpriseArchive jpa_core_entityManagerFactoryCloseException_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_entityManagerFactoryCloseException_vehicles.ear"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactoryCloseExceptions/"); - if(earResURL != null) { - jpa_core_entityManagerFactoryCloseException_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactoryCloseExceptions/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactoryCloseException_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientAppmanagednotxTest.java index 4b39bb623f..05b72c3266 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactoryCloseException_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManagerFactoryCloseException_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactoryCloseException_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactoryCloseException_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactoryCloseException_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactoryCloseException_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactoryCloseException_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManagerFactoryCloseException_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManagerFactoryCloseException_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Ear EnterpriseArchive jpa_core_entityManagerFactoryCloseException_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_entityManagerFactoryCloseException_vehicles.ear"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactoryCloseExceptions/"); - if(earResURL != null) { - jpa_core_entityManagerFactoryCloseException_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactoryCloseExceptions/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactoryCloseException_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientPmservletTest.java index f545f40d8e..2e20e711c8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientPmservletTest.java @@ -115,6 +115,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entityManagerFactoryCloseException_pmservlet_vehicle_web, Client.class, warResURL); + // Ear EnterpriseArchive jpa_core_entityManagerFactoryCloseException_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_entityManagerFactoryCloseException_vehicles.ear"); @@ -126,12 +127,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactoryCloseExceptions/"); - if(earResURL != null) { - jpa_core_entityManagerFactoryCloseException_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactoryCloseExceptions/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactoryCloseException_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientPuservletTest.java index f4c7795d82..04091202ee 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientPuservletTest.java @@ -115,6 +115,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entityManagerFactoryCloseException_puservlet_vehicle_web, Client.class, warResURL); + // Ear EnterpriseArchive jpa_core_entityManagerFactoryCloseException_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_entityManagerFactoryCloseException_vehicles.ear"); @@ -126,12 +127,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactoryCloseExceptions/"); - if(earResURL != null) { - jpa_core_entityManagerFactoryCloseException_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactoryCloseExceptions/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactoryCloseException_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientStateful3Test.java index f05ebc8bad..b42612cdeb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactoryCloseException_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManagerFactoryCloseException_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactoryCloseException_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactoryCloseException_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactoryCloseException_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactoryCloseException_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactoryCloseException_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManagerFactoryCloseException_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManagerFactoryCloseException_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Ear EnterpriseArchive jpa_core_entityManagerFactoryCloseException_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_entityManagerFactoryCloseException_vehicles.ear"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactoryCloseExceptions/"); - if(earResURL != null) { - jpa_core_entityManagerFactoryCloseException_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactoryCloseExceptions/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactoryCloseException_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientStateless3Test.java index dbd7540eb6..ff5174233e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactoryCloseException_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityManagerFactoryCloseException_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactoryCloseException_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactoryCloseException_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactoryCloseException_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityManagerFactoryCloseException_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityManagerFactoryCloseException_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityManagerFactoryCloseException_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityManagerFactoryCloseException_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Ear EnterpriseArchive jpa_core_entityManagerFactoryCloseException_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_entityManagerFactoryCloseException_vehicles.ear"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactoryCloseExceptions/"); - if(earResURL != null) { - jpa_core_entityManagerFactoryCloseException_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entityManagerFactoryCloseExceptions/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityManagerFactoryCloseException_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientAppmanagednotxTest.java index 9b260d7baa..3bfefa2943 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientAppmanagednotxTest.java @@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityTransaction_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityTransaction_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityTransaction_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -120,17 +120,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityTransaction_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityTransaction_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityTransaction_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityTransaction_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityTransaction_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityTransaction_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -165,12 +166,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entityTransaction/"); - if(earResURL != null) { - jpa_core_entityTransaction_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entityTransaction/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityTransaction_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientPmservletTest.java index 7c036321f9..42f82de6b0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientPmservletTest.java @@ -106,6 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entityTransaction_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entityTransaction = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityTransaction.jar"); @@ -138,12 +139,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entityTransaction/"); - if(earResURL != null) { - jpa_core_entityTransaction_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entityTransaction/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityTransaction_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientPuservletTest.java index cadf4c5476..593cc38da0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientPuservletTest.java @@ -106,6 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entityTransaction_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entityTransaction = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityTransaction.jar"); @@ -138,12 +139,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entityTransaction/"); - if(earResURL != null) { - jpa_core_entityTransaction_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entityTransaction/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityTransaction_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientStateless3Test.java index 147630d597..e6640b1a6f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientStateless3Test.java @@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityTransaction_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entityTransaction_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityTransaction_stateless3_vehicle_ejb.jar"); // The class files @@ -120,17 +120,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.entityTransaction.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entityTransaction_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entityTransaction_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entityTransaction_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entityTransaction_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entityTransaction_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entityTransaction_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -165,12 +166,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entityTransaction/"); - if(earResURL != null) { - jpa_core_entityTransaction_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entityTransaction/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entityTransaction_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientAppmanagedTest.java index 2a866b62af..b7ca1272d0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_apitests_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entitytest_apitests_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_apitests_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_apitests_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_apitests_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_apitests_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_apitests_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entitytest_apitests_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entitytest_apitests_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/apitests/"); - if(earResURL != null) { - jpa_core_entitytest_apitests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/apitests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entitytest_apitests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientAppmanagednotxTest.java index 23fbc15411..0ce267ac55 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_apitests_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entitytest_apitests_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_apitests_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_apitests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_apitests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_apitests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_apitests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entitytest_apitests_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entitytest_apitests_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/apitests/"); - if(earResURL != null) { - jpa_core_entitytest_apitests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/apitests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entitytest_apitests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientPmservletTest.java index 3cd864097b..7a7b934267 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entitytest_apitests_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entitytest_apitests = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_apitests.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/apitests/"); - if(earResURL != null) { - jpa_core_entitytest_apitests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/apitests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entitytest_apitests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientPuservletTest.java index 6f70571951..d219410c55 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entitytest_apitests_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entitytest_apitests = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_apitests.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/apitests/"); - if(earResURL != null) { - jpa_core_entitytest_apitests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/apitests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entitytest_apitests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientStateful3Test.java index 26e7a83a45..8bdf2e199a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_apitests_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entitytest_apitests_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_apitests_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_apitests_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_apitests_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_apitests_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_apitests_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entitytest_apitests_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entitytest_apitests_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/apitests/"); - if(earResURL != null) { - jpa_core_entitytest_apitests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/apitests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entitytest_apitests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientStateless3Test.java index ebd895ed19..4c640157f5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_apitests_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entitytest_apitests_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_apitests_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_apitests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_apitests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_apitests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_apitests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entitytest_apitests_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entitytest_apitests_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/apitests/"); - if(earResURL != null) { - jpa_core_entitytest_apitests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/apitests/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entitytest_apitests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientAppmanagedTest.java index 72ff097a35..3686bcfd42 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_bigdecimal_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entitytest_bigdecimal_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_bigdecimal_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.entitytest.bigdecimal.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_bigdecimal_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_bigdecimal_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_bigdecimal_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_bigdecimal_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entitytest_bigdecimal_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entitytest_bigdecimal_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/bigdecimal/"); - if(earResURL != null) { - jpa_core_entitytest_bigdecimal_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/bigdecimal/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entitytest_bigdecimal_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientAppmanagednotxTest.java index ce818f4e3d..0641de7516 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_bigdecimal_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entitytest_bigdecimal_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_bigdecimal_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.entitytest.bigdecimal.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_bigdecimal_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_bigdecimal_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_bigdecimal_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_bigdecimal_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entitytest_bigdecimal_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entitytest_bigdecimal_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/bigdecimal/"); - if(earResURL != null) { - jpa_core_entitytest_bigdecimal_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/bigdecimal/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entitytest_bigdecimal_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientPmservletTest.java index 6a93c2af82..54725a524a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entitytest_bigdecimal_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entitytest_bigdecimal = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_bigdecimal.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/bigdecimal/"); - if(earResURL != null) { - jpa_core_entitytest_bigdecimal_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/bigdecimal/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entitytest_bigdecimal_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientPuservletTest.java index 8f9408e5e1..91ae9df43e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entitytest_bigdecimal_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entitytest_bigdecimal = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_bigdecimal.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/bigdecimal/"); - if(earResURL != null) { - jpa_core_entitytest_bigdecimal_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/bigdecimal/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entitytest_bigdecimal_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientStateful3Test.java index d4a295251d..fef0ffac52 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_bigdecimal_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entitytest_bigdecimal_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_bigdecimal_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.entitytest.bigdecimal.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_bigdecimal_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_bigdecimal_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_bigdecimal_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_bigdecimal_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entitytest_bigdecimal_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entitytest_bigdecimal_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/bigdecimal/"); - if(earResURL != null) { - jpa_core_entitytest_bigdecimal_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/bigdecimal/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entitytest_bigdecimal_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientStateless3Test.java index efb24f2453..fc9c70c261 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_bigdecimal_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entitytest_bigdecimal_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_bigdecimal_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.entitytest.bigdecimal.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_bigdecimal_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_bigdecimal_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_bigdecimal_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_bigdecimal_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entitytest_bigdecimal_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entitytest_bigdecimal_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/bigdecimal/"); - if(earResURL != null) { - jpa_core_entitytest_bigdecimal_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/bigdecimal/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entitytest_bigdecimal_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientAppmanagedTest.java index 5d828cbf91..1fe8702fe4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_biginteger_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entitytest_biginteger_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_biginteger_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_biginteger_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_biginteger_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_biginteger_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_biginteger_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entitytest_biginteger_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entitytest_biginteger_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/biginteger/"); - if(earResURL != null) { - jpa_core_entitytest_biginteger_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/biginteger/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entitytest_biginteger_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientAppmanagednotxTest.java index db9ac9020b..63d13f3127 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_biginteger_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entitytest_biginteger_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_biginteger_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_biginteger_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_biginteger_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_biginteger_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_biginteger_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entitytest_biginteger_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entitytest_biginteger_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/biginteger/"); - if(earResURL != null) { - jpa_core_entitytest_biginteger_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/biginteger/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entitytest_biginteger_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientPmservletTest.java index d3916aa137..99756ea648 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entitytest_biginteger_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entitytest_biginteger = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_biginteger.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/biginteger/"); - if(earResURL != null) { - jpa_core_entitytest_biginteger_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/biginteger/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entitytest_biginteger_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientPuservletTest.java index fffc9d8abe..3c2650feb5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_entitytest_biginteger_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_entitytest_biginteger = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_biginteger.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/biginteger/"); - if(earResURL != null) { - jpa_core_entitytest_biginteger_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/biginteger/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entitytest_biginteger_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientStateful3Test.java index 91ac8fff7f..f6b332ae07 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_biginteger_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entitytest_biginteger_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_biginteger_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_biginteger_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_biginteger_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_biginteger_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_biginteger_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entitytest_biginteger_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entitytest_biginteger_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/biginteger/"); - if(earResURL != null) { - jpa_core_entitytest_biginteger_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/biginteger/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entitytest_biginteger_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientStateless3Test.java index de6d239928..0e50a97056 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_biginteger_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_entitytest_biginteger_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_biginteger_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_biginteger_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_biginteger_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_entitytest_biginteger_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_entitytest_biginteger_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_entitytest_biginteger_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_entitytest_biginteger_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/biginteger/"); - if(earResURL != null) { - jpa_core_entitytest_biginteger_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/biginteger/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_entitytest_biginteger_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientAppmanagedTest.java index c9d394e795..09b293453e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_manyXmany_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_manyXmany_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXmany_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_manyXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_manyXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_manyXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_manyXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_manyXmany_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_manyXmany_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXmany/"); - if(earResURL != null) { - jpa_core_et_cascadeall_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientAppmanagednotxTest.java index bd81d0c336..7bdf347755 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_manyXmany_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_manyXmany_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXmany_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_manyXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_manyXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_manyXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_manyXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_manyXmany_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_manyXmany_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXmany/"); - if(earResURL != null) { - jpa_core_et_cascadeall_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientPmservletTest.java index ff43c9fcaf..f913ecf151 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_cascadeall_manyXmany_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_manyXmany = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXmany.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXmany/"); - if(earResURL != null) { - jpa_core_et_cascadeall_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientPuservletTest.java index 734a5b75c9..78cd4ca161 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_cascadeall_manyXmany_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_manyXmany = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXmany.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXmany/"); - if(earResURL != null) { - jpa_core_et_cascadeall_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientStateful3Test.java index 08650ad98b..14fcc80ec8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_manyXmany_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_manyXmany_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXmany_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_manyXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_manyXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_manyXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_manyXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_manyXmany_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_manyXmany_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXmany/"); - if(earResURL != null) { - jpa_core_et_cascadeall_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientStateless3Test.java index 341cee8140..559adcc21e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_manyXmany_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_manyXmany_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXmany_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_manyXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_manyXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_manyXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_manyXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_manyXmany_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_manyXmany_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXmany/"); - if(earResURL != null) { - jpa_core_et_cascadeall_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientAppmanagedTest.java index 97ec2ffa57..dc115f9f9b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_manyXone_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_manyXone_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXone_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_manyXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_manyXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_manyXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_manyXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_manyXone_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_manyXone_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXone/"); - if(earResURL != null) { - jpa_core_et_cascadeall_manyXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_manyXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientAppmanagednotxTest.java index 4746c758c0..66315c739f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_manyXone_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_manyXone_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXone_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_manyXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_manyXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_manyXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_manyXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_manyXone_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_manyXone_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXone/"); - if(earResURL != null) { - jpa_core_et_cascadeall_manyXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_manyXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientPmservletTest.java index d95c029cf8..ea0a48576a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_cascadeall_manyXone_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_manyXone = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXone.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXone/"); - if(earResURL != null) { - jpa_core_et_cascadeall_manyXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_manyXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientPuservletTest.java index 1c4fd0f348..204f56b121 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_cascadeall_manyXone_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_manyXone = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXone.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXone/"); - if(earResURL != null) { - jpa_core_et_cascadeall_manyXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_manyXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientStateful3Test.java index 7f05f2e522..67abc2f10e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_manyXone_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_manyXone_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXone_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_manyXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_manyXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_manyXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_manyXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_manyXone_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_manyXone_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXone/"); - if(earResURL != null) { - jpa_core_et_cascadeall_manyXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_manyXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientStateless3Test.java index c7d3165f81..69e6c64b63 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_manyXone_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_manyXone_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXone_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_manyXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_manyXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_manyXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_manyXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_manyXone_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_manyXone_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXone/"); - if(earResURL != null) { - jpa_core_et_cascadeall_manyXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_manyXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientAppmanagedTest.java index 1437948df3..16fe496853 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_oneXmany_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_oneXmany_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXmany_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_oneXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_oneXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_oneXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_oneXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_oneXmany_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_oneXmany_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXmany/"); - if(earResURL != null) { - jpa_core_et_cascadeall_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientAppmanagednotxTest.java index d99006ae6f..d01cc62433 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_oneXmany_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_oneXmany_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXmany_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_oneXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_oneXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_oneXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_oneXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_oneXmany_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_oneXmany_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXmany/"); - if(earResURL != null) { - jpa_core_et_cascadeall_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientPmservletTest.java index 30a198a01f..2d525c41bc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_cascadeall_oneXmany_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_oneXmany = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXmany.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXmany/"); - if(earResURL != null) { - jpa_core_et_cascadeall_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientPuservletTest.java index 860e8458e7..3181bfea6c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_cascadeall_oneXmany_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_oneXmany = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXmany.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXmany/"); - if(earResURL != null) { - jpa_core_et_cascadeall_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientStateful3Test.java index 55e855a099..f11d4343b2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_oneXmany_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_oneXmany_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXmany_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_oneXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_oneXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_oneXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_oneXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_oneXmany_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_oneXmany_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXmany/"); - if(earResURL != null) { - jpa_core_et_cascadeall_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientStateless3Test.java index ad069f04c9..4c7dfc829f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_oneXmany_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_oneXmany_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXmany_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_oneXmany_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_oneXmany_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXmany/"); - if(earResURL != null) { - jpa_core_et_cascadeall_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientAppmanagedTest.java index 5426050d4c..8dd60e8711 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_oneXone_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_oneXone_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXone_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_oneXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_oneXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_oneXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_oneXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_oneXone_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_oneXone_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXone/"); - if(earResURL != null) { - jpa_core_et_cascadeall_oneXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_oneXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientAppmanagednotxTest.java index bd138db0ba..830af7f90f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_oneXone_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_oneXone_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXone_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_oneXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_oneXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_oneXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_oneXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_oneXone_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_oneXone_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXone/"); - if(earResURL != null) { - jpa_core_et_cascadeall_oneXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_oneXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientPmservletTest.java index 66d331c272..63f151fc10 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_cascadeall_oneXone_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_oneXone = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXone.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXone/"); - if(earResURL != null) { - jpa_core_et_cascadeall_oneXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_oneXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientPuservletTest.java index c5ef1c2b8e..4c26f12f28 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_cascadeall_oneXone_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_oneXone = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXone.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXone/"); - if(earResURL != null) { - jpa_core_et_cascadeall_oneXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_oneXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientStateful3Test.java index 2fb6f70103..bc56e1a210 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_oneXone_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_oneXone_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXone_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_oneXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_oneXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_oneXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_oneXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_oneXone_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_oneXone_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXone/"); - if(earResURL != null) { - jpa_core_et_cascadeall_oneXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_oneXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientStateless3Test.java index 7b7a40abfe..ea04fba34a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_oneXone_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_cascadeall_oneXone_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXone_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_cascadeall_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_cascadeall_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_oneXone_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_cascadeall_oneXone_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXone/"); - if(earResURL != null) { - jpa_core_et_cascadeall_oneXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_cascadeall_oneXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/basic/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/basic/ClientPmservletTest.java index 0e4741ba78..f7cc2dd02d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/basic/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/basic/ClientPmservletTest.java @@ -103,6 +103,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_detach_basic_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_detach_basic = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_detach_basic.jar"); @@ -136,12 +137,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/detach/basic/"); - if(earResURL != null) { - jpa_core_et_detach_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/detach/basic/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_detach_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/basic/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/basic/ClientStateless3Test.java index 97522822d6..de8277fddd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/basic/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/basic/ClientStateless3Test.java @@ -92,7 +92,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_detach_basic_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_detach_basic_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_detach_basic_stateless3_vehicle_ejb.jar"); // The class files @@ -117,17 +117,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_detach_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_detach_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_detach_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_detach_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_detach_basic_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_detach_basic_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -163,12 +164,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/detach/basic/"); - if(earResURL != null) { - jpa_core_et_detach_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/detach/basic/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_detach_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXmany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXmany/ClientPmservletTest.java index 15330e54e3..f30db4e477 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXmany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXmany/ClientPmservletTest.java @@ -103,6 +103,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_detach_manyXmany_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_detach_manyXmany = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_detach_manyXmany.jar"); @@ -137,12 +138,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/detach/manyXmany/"); - if(earResURL != null) { - jpa_core_et_detach_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/detach/manyXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_detach_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXmany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXmany/ClientStateless3Test.java index e9ab6b3854..29cfa4850d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXmany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXmany/ClientStateless3Test.java @@ -92,7 +92,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_detach_manyXmany_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_detach_manyXmany_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_detach_manyXmany_stateless3_vehicle_ejb.jar"); // The class files @@ -117,17 +117,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_detach_manyXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_detach_manyXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_detach_manyXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_detach_manyXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_detach_manyXmany_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_detach_manyXmany_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -164,12 +165,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/detach/manyXmany/"); - if(earResURL != null) { - jpa_core_et_detach_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/detach/manyXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_detach_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXone/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXone/ClientPmservletTest.java index e0f09b16f3..4caec4fa4c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXone/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXone/ClientPmservletTest.java @@ -103,6 +103,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_detach_manyXone_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_detach_manyXone = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_detach_manyXone.jar"); @@ -137,12 +138,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/detach/manyXone/"); - if(earResURL != null) { - jpa_core_et_detach_manyXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/detach/manyXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_detach_manyXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXone/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXone/ClientStateless3Test.java index 9b12d2942c..3792a8b42e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXone/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXone/ClientStateless3Test.java @@ -92,7 +92,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_detach_manyXone_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_detach_manyXone_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_detach_manyXone_stateless3_vehicle_ejb.jar"); // The class files @@ -117,17 +117,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_detach_manyXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_detach_manyXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_detach_manyXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_detach_manyXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_detach_manyXone_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_detach_manyXone_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -164,12 +165,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/detach/manyXone/"); - if(earResURL != null) { - jpa_core_et_detach_manyXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/detach/manyXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_detach_manyXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXmany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXmany/ClientPmservletTest.java index 42fd1a21f2..e677486365 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXmany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXmany/ClientPmservletTest.java @@ -103,6 +103,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_detach_oneXmany_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_detach_oneXmany = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_detach_oneXmany.jar"); @@ -137,12 +138,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/detach/oneXmany/"); - if(earResURL != null) { - jpa_core_et_detach_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/detach/oneXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_detach_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXmany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXmany/ClientStateless3Test.java index c8f1285d28..0a50e62dae 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXmany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXmany/ClientStateless3Test.java @@ -92,7 +92,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_detach_oneXmany_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_detach_oneXmany_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_detach_oneXmany_stateless3_vehicle_ejb.jar"); // The class files @@ -117,17 +117,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_detach_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_detach_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_detach_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_detach_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_detach_oneXmany_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_detach_oneXmany_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -164,12 +165,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/detach/oneXmany/"); - if(earResURL != null) { - jpa_core_et_detach_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/detach/oneXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_detach_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXone/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXone/ClientPmservletTest.java index e3b97f4a3a..f2da872b10 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXone/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXone/ClientPmservletTest.java @@ -103,6 +103,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_detach_oneXone_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_detach_oneXone = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_detach_oneXone.jar"); @@ -137,12 +138,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/detach/oneXone/"); - if(earResURL != null) { - jpa_core_et_detach_oneXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/detach/oneXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_detach_oneXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXone/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXone/ClientStateless3Test.java index 27a65f72cd..0efb14c0de 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXone/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXone/ClientStateless3Test.java @@ -92,7 +92,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_detach_oneXone_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_detach_oneXone_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_detach_oneXone_stateless3_vehicle_ejb.jar"); // The class files @@ -117,17 +117,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_detach_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_detach_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_detach_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_detach_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_detach_oneXone_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_detach_oneXone_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -164,12 +165,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/detach/oneXone/"); - if(earResURL != null) { - jpa_core_et_detach_oneXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/detach/oneXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_detach_oneXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientAppmanagedTest.java index 24b289e782..56789ebc84 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_basic_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_basic_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_basic_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_basic_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_basic_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/basic/"); - if(earResURL != null) { - jpa_core_et_persist_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/basic/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientAppmanagednotxTest.java index 9fba015527..5b62eab7ac 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_basic_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_basic_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_basic_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_basic_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_basic_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/basic/"); - if(earResURL != null) { - jpa_core_et_persist_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/basic/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientPmservletTest.java index d9aa4d850a..9f353a1ff4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_persist_basic_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_persist_basic = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_basic.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/basic/"); - if(earResURL != null) { - jpa_core_et_persist_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/basic/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientPuservletTest.java index 94179a8793..56a2b34bff 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_persist_basic_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_persist_basic = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_basic.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/basic/"); - if(earResURL != null) { - jpa_core_et_persist_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/basic/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientStateful3Test.java index 1027063cf4..d60a205bde 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_basic_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_basic_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_basic_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_basic_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_basic_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/basic/"); - if(earResURL != null) { - jpa_core_et_persist_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/basic/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientStateless3Test.java index 5a73096aa1..6c50522a48 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_basic_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_basic_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_basic_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_basic_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_basic_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/basic/"); - if(earResURL != null) { - jpa_core_et_persist_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/basic/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientAppmanagedTest.java index 2c09a88a54..605c641a64 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_manyXmany_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_manyXmany_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXmany_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_manyXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_manyXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_manyXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_manyXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_manyXmany_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_manyXmany_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXmany/"); - if(earResURL != null) { - jpa_core_et_persist_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientAppmanagednotxTest.java index 72db9ee580..53f954156b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_manyXmany_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_manyXmany_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXmany_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_manyXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_manyXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_manyXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_manyXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_manyXmany_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_manyXmany_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXmany/"); - if(earResURL != null) { - jpa_core_et_persist_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientPmservletTest.java index 3038a0f791..9265e60967 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_persist_manyXmany_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_persist_manyXmany = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXmany.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXmany/"); - if(earResURL != null) { - jpa_core_et_persist_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientPuservletTest.java index d5e5e4cc9a..0bcb76e6e4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_persist_manyXmany_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_persist_manyXmany = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXmany.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXmany/"); - if(earResURL != null) { - jpa_core_et_persist_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientStateful3Test.java index 7330c4fa97..d32e0f8045 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_manyXmany_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_manyXmany_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXmany_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_manyXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_manyXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_manyXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_manyXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_manyXmany_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_manyXmany_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXmany/"); - if(earResURL != null) { - jpa_core_et_persist_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientStateless3Test.java index 675635c88e..3bd3c40a19 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_manyXmany_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_manyXmany_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXmany_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_manyXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_manyXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_manyXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_manyXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_manyXmany_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_manyXmany_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXmany/"); - if(earResURL != null) { - jpa_core_et_persist_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_manyXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientAppmanagedTest.java index 643a99d2d3..e966606e02 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_manyXone_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_manyXone_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXone_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_manyXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_manyXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_manyXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_manyXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_manyXone_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_manyXone_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXone/"); - if(earResURL != null) { - jpa_core_et_persist_manyXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_manyXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientAppmanagednotxTest.java index a79d30d7c2..d57e8d63c3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_manyXone_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_manyXone_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXone_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_manyXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_manyXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_manyXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_manyXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_manyXone_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_manyXone_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXone/"); - if(earResURL != null) { - jpa_core_et_persist_manyXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_manyXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientPmservletTest.java index 0ef95db5c6..0698e7fa73 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_persist_manyXone_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_persist_manyXone = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXone.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXone/"); - if(earResURL != null) { - jpa_core_et_persist_manyXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_manyXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientPuservletTest.java index 2113f67d28..09bcb8fa83 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_persist_manyXone_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_persist_manyXone = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXone.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXone/"); - if(earResURL != null) { - jpa_core_et_persist_manyXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_manyXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientStateful3Test.java index b998cf5fc0..58bab1eefb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_manyXone_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_manyXone_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXone_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_manyXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_manyXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_manyXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_manyXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_manyXone_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_manyXone_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXone/"); - if(earResURL != null) { - jpa_core_et_persist_manyXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_manyXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientStateless3Test.java index 567091cd12..85f975c5a9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_manyXone_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_manyXone_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXone_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_manyXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_manyXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_manyXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_manyXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_manyXone_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_manyXone_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXone/"); - if(earResURL != null) { - jpa_core_et_persist_manyXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/manyXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_manyXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientAppmanagedTest.java index d8a4228f03..77267ada5f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientAppmanagedTest.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXmany_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_oneXmany_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmany_appmanaged_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXmany_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXmany_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +184,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmany/"); - if(earResURL != null) { - jpa_core_et_persist_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientAppmanagednotxTest.java index a76371b472..a9d71d12d2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientAppmanagednotxTest.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXmany_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_oneXmany_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmany_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXmany_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXmany_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +184,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmany/"); - if(earResURL != null) { - jpa_core_et_persist_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientPmservletTest.java index e6d480467b..cb5ce033ab 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientPmservletTest.java @@ -122,6 +122,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_persist_oneXmany_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_persist_oneXmany = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmany.jar"); @@ -156,12 +157,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmany/"); - if(earResURL != null) { - jpa_core_et_persist_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientPuservletTest.java index c6b3d5c510..b32440ee1b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientPuservletTest.java @@ -122,6 +122,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_persist_oneXmany_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_persist_oneXmany = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmany.jar"); @@ -156,12 +157,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmany/"); - if(earResURL != null) { - jpa_core_et_persist_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientStateful3Test.java index 298082a601..f8a4e9a678 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientStateful3Test.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXmany_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_oneXmany_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmany_stateful3_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXmany_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXmany_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +184,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmany/"); - if(earResURL != null) { - jpa_core_et_persist_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientStateless3Test.java index 3ce946f6b8..0b4262280d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientStateless3Test.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXmany_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_oneXmany_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmany_stateless3_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXmany_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXmany_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -183,12 +184,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmany/"); - if(earResURL != null) { - jpa_core_et_persist_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientAppmanagedTest.java index be0020a289..8f0571ee82 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXone_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_oneXone_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXone_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXone_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXone_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXone/"); - if(earResURL != null) { - jpa_core_et_persist_oneXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_oneXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientAppmanagednotxTest.java index 4125f3e5f5..7cc65331bd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXone_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_oneXone_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXone_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXone_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXone_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXone/"); - if(earResURL != null) { - jpa_core_et_persist_oneXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_oneXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientPmservletTest.java index b93f5260c6..f0972546a3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_persist_oneXone_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_persist_oneXone = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXone.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXone/"); - if(earResURL != null) { - jpa_core_et_persist_oneXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_oneXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientPuservletTest.java index fe6d19b99f..b72285e011 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_persist_oneXone_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_persist_oneXone = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXone.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXone/"); - if(earResURL != null) { - jpa_core_et_persist_oneXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_oneXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientStateful3Test.java index 84e26fb169..15c591a424 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXone_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_oneXone_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXone_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXone_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXone_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXone/"); - if(earResURL != null) { - jpa_core_et_persist_oneXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_oneXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientStateless3Test.java index 6940431c78..c0faa38cf5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXone_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_oneXone_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXone_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXone_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXone_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXone/"); - if(earResURL != null) { - jpa_core_et_persist_oneXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_oneXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientAppmanagedTest.java index 3d198e3434..7f15477647 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_basic_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_remove_basic_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_basic_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_remove_basic_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_remove_basic_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/basic/"); - if(earResURL != null) { - jpa_core_et_remove_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/basic/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_remove_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientAppmanagednotxTest.java index 5c63c8b87c..ca80168866 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_basic_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_remove_basic_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_basic_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_remove_basic_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_remove_basic_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/basic/"); - if(earResURL != null) { - jpa_core_et_remove_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/basic/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_remove_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientPmservletTest.java index 92dfb38cba..e6f09fccaa 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_remove_basic_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_remove_basic = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_basic.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/basic/"); - if(earResURL != null) { - jpa_core_et_remove_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/basic/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_remove_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientPuservletTest.java index d94d49e0cf..dae976856c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_remove_basic_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_remove_basic = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_basic.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/basic/"); - if(earResURL != null) { - jpa_core_et_remove_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/basic/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_remove_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientStateful3Test.java index d5a80f304c..0909879a4b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_basic_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_remove_basic_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_basic_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_remove_basic_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_remove_basic_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/basic/"); - if(earResURL != null) { - jpa_core_et_remove_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/basic/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_remove_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientStateless3Test.java index c93655fc71..e8343a0193 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_basic_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_remove_basic_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_basic_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_remove_basic_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_remove_basic_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/basic/"); - if(earResURL != null) { - jpa_core_et_remove_basic_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/basic/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_remove_basic_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientAppmanagedTest.java index 3f56dabd05..6c40a3fa65 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_oneXmany_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_remove_oneXmany_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXmany_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_oneXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_oneXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_oneXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_oneXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_remove_oneXmany_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_remove_oneXmany_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXmany/"); - if(earResURL != null) { - jpa_core_et_remove_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_remove_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientAppmanagednotxTest.java index 27495d6639..3e87b88570 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_oneXmany_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_remove_oneXmany_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXmany_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_oneXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_oneXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_oneXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_oneXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_remove_oneXmany_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_remove_oneXmany_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXmany/"); - if(earResURL != null) { - jpa_core_et_remove_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_remove_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientPmservletTest.java index 6a80300321..62842c88e7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_remove_oneXmany_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_remove_oneXmany = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXmany.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXmany/"); - if(earResURL != null) { - jpa_core_et_remove_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_remove_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientPuservletTest.java index 9ce74e1dd2..7d190ba644 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_remove_oneXmany_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_remove_oneXmany = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXmany.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXmany/"); - if(earResURL != null) { - jpa_core_et_remove_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_remove_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientStateful3Test.java index 2c02312b1a..7cbe017aaf 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_oneXmany_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_remove_oneXmany_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXmany_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_oneXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_oneXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_oneXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_oneXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_remove_oneXmany_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_remove_oneXmany_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXmany/"); - if(earResURL != null) { - jpa_core_et_remove_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_remove_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientStateless3Test.java index 628fec15d2..8e50bb1aac 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_oneXmany_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_remove_oneXmany_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXmany_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_remove_oneXmany_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_remove_oneXmany_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXmany/"); - if(earResURL != null) { - jpa_core_et_remove_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_remove_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientAppmanagedTest.java index 9aba394443..8a84afa0ee 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_oneXone_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_remove_oneXone_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXone_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_oneXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_oneXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_oneXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_oneXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_remove_oneXone_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_remove_oneXone_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXone/"); - if(earResURL != null) { - jpa_core_et_remove_oneXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_remove_oneXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientAppmanagednotxTest.java index e7347eab16..cf368baf26 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_oneXone_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_remove_oneXone_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXone_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_oneXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_oneXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_oneXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_oneXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_remove_oneXone_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_remove_oneXone_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXone/"); - if(earResURL != null) { - jpa_core_et_remove_oneXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_remove_oneXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientPmservletTest.java index 29231bccb8..4b5d174525 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_remove_oneXone_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_remove_oneXone = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXone.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXone/"); - if(earResURL != null) { - jpa_core_et_remove_oneXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_remove_oneXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientPuservletTest.java index 5354f72802..8db7cc5ec0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_remove_oneXone_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_remove_oneXone = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXone.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXone/"); - if(earResURL != null) { - jpa_core_et_remove_oneXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_remove_oneXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientStateful3Test.java index c10c2dabb5..564f94bb8e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_oneXone_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_remove_oneXone_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXone_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_oneXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_oneXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_oneXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_oneXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_remove_oneXone_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_remove_oneXone_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXone/"); - if(earResURL != null) { - jpa_core_et_remove_oneXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_remove_oneXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientStateless3Test.java index aa5c1c35ac..59b8787200 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_oneXone_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_remove_oneXone_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXone_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_remove_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_remove_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_remove_oneXone_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_remove_oneXone_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXone/"); - if(earResURL != null) { - jpa_core_et_remove_oneXone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/remove/oneXone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_remove_oneXone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientAppmanagedTest.java index b7ad81ce11..b9257ff9ef 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_enums_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_enums_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_enums_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_enums_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_enums_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_enums_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_enums_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_enums_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_enums_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/enums/"); - if(earResURL != null) { - jpa_core_enums_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/enums/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_enums_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientAppmanagednotxTest.java index 4cee24c284..07928cc45b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_enums_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_enums_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_enums_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_enums_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_enums_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_enums_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_enums_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_enums_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_enums_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/enums/"); - if(earResURL != null) { - jpa_core_enums_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/enums/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_enums_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientPmservletTest.java index 63ad76d653..18dd731a18 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_enums_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_enums = ShrinkWrap.create(JavaArchive.class, "jpa_core_enums.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/enums/"); - if(earResURL != null) { - jpa_core_enums_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/enums/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_enums_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientPuservletTest.java index 291003d9e4..7e1efa806d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_enums_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_enums = ShrinkWrap.create(JavaArchive.class, "jpa_core_enums.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/enums/"); - if(earResURL != null) { - jpa_core_enums_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/enums/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_enums_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientStateful3Test.java index 5b65a8ce91..d6c873cd60 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_enums_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_enums_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_enums_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_enums_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_enums_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_enums_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_enums_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_enums_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_enums_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/enums/"); - if(earResURL != null) { - jpa_core_enums_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/enums/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_enums_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientStateless3Test.java index 8dd5313d2e..12dd1cf4e4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_enums_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_enums_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_enums_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_enums_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_enums_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_enums_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_enums_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_enums_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_enums_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/enums/"); - if(earResURL != null) { - jpa_core_enums_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/enums/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_enums_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/exceptions/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/exceptions/ClientPmservletTest.java index d0c9f94904..31655f42f9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/exceptions/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/exceptions/ClientPmservletTest.java @@ -103,6 +103,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_exceptions_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_exceptions = ShrinkWrap.create(JavaArchive.class, "jpa_core_exceptions.jar"); @@ -136,12 +137,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/exceptions/"); - if(earResURL != null) { - jpa_core_exceptions_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/exceptions/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_exceptions_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/exceptions/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/exceptions/ClientStateless3Test.java index 12736c64cc..1bbe7e13b4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/exceptions/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/exceptions/ClientStateless3Test.java @@ -92,7 +92,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_exceptions_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_exceptions_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_exceptions_stateless3_vehicle_ejb.jar"); // The class files @@ -117,17 +117,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_exceptions_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_exceptions_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_exceptions_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_exceptions_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_exceptions_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_exceptions_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -163,12 +164,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/exceptions/"); - if(earResURL != null) { - jpa_core_exceptions_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/exceptions/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_exceptions_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientAppmanagedTest.java index 2faf53dda7..7c2dfa7936 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inheritance_abstractentity_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_inheritance_abstractentity_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_inheritance_abstractentity_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_inheritance_abstractentity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_inheritance_abstractentity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_inheritance_abstractentity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_inheritance_abstractentity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_inheritance_abstractentity_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_inheritance_abstractentity_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/abstractentity/"); - if(earResURL != null) { - jpa_core_inheritance_abstractentity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/abstractentity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inheritance_abstractentity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientAppmanagednotxTest.java index 44067a115e..1ea3293cc0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inheritance_abstractentity_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_inheritance_abstractentity_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_inheritance_abstractentity_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_inheritance_abstractentity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_inheritance_abstractentity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_inheritance_abstractentity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_inheritance_abstractentity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_inheritance_abstractentity_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_inheritance_abstractentity_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/abstractentity/"); - if(earResURL != null) { - jpa_core_inheritance_abstractentity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/abstractentity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inheritance_abstractentity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientPmservletTest.java index 9ddff367d5..f3ce3f44a3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_inheritance_abstractentity_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_inheritance_abstractentity = ShrinkWrap.create(JavaArchive.class, "jpa_core_inheritance_abstractentity.jar"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/abstractentity/"); - if(earResURL != null) { - jpa_core_inheritance_abstractentity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/abstractentity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inheritance_abstractentity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientPuservletTest.java index 464856138a..ed58d65b64 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_inheritance_abstractentity_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_inheritance_abstractentity = ShrinkWrap.create(JavaArchive.class, "jpa_core_inheritance_abstractentity.jar"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/abstractentity/"); - if(earResURL != null) { - jpa_core_inheritance_abstractentity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/abstractentity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inheritance_abstractentity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientStateful3Test.java index 3806715a4d..11b2e7b848 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inheritance_abstractentity_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_inheritance_abstractentity_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_inheritance_abstractentity_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_inheritance_abstractentity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_inheritance_abstractentity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_inheritance_abstractentity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_inheritance_abstractentity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_inheritance_abstractentity_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_inheritance_abstractentity_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/abstractentity/"); - if(earResURL != null) { - jpa_core_inheritance_abstractentity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/abstractentity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inheritance_abstractentity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientStateless3Test.java index cb363b0b93..d7177e6eb9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inheritance_abstractentity_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_inheritance_abstractentity_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_inheritance_abstractentity_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_inheritance_abstractentity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_inheritance_abstractentity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_inheritance_abstractentity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_inheritance_abstractentity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_inheritance_abstractentity_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_inheritance_abstractentity_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/abstractentity/"); - if(earResURL != null) { - jpa_core_inheritance_abstractentity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/abstractentity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inheritance_abstractentity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientAppmanagedTest.java index d38c07e147..1bbce31573 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_msc_annotation_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_inherit_msc_annotation_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_annotation_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_inherit_msc_annotation_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_msc_annotation_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_inherit_msc_annotation_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_msc_annotation_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_inherit_msc_annotation_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_inherit_msc_annotation_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/annotation/"); - if(earResURL != null) { - jpa_core_inherit_msc_annotation_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/annotation/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inherit_msc_annotation_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientAppmanagednotxTest.java index 47959e15c3..992740e388 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_msc_annotation_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_inherit_msc_annotation_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_annotation_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_inherit_msc_annotation_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_msc_annotation_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_inherit_msc_annotation_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_msc_annotation_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_inherit_msc_annotation_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_inherit_msc_annotation_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/annotation/"); - if(earResURL != null) { - jpa_core_inherit_msc_annotation_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/annotation/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inherit_msc_annotation_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientPmservletTest.java index 9bb955be75..7aaef149ab 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_inherit_msc_annotation_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_inherit_msc_annotation = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_annotation.jar"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/annotation/"); - if(earResURL != null) { - jpa_core_inherit_msc_annotation_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/annotation/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inherit_msc_annotation_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientPuservletTest.java index 8d1a8cb69d..a768682cbe 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_inherit_msc_annotation_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_inherit_msc_annotation = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_annotation.jar"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/annotation/"); - if(earResURL != null) { - jpa_core_inherit_msc_annotation_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/annotation/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inherit_msc_annotation_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientStateful3Test.java index 4a184ecbc1..4f5c4bf5d7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_msc_annotation_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_inherit_msc_annotation_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_annotation_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_inherit_msc_annotation_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_msc_annotation_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_inherit_msc_annotation_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_msc_annotation_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_inherit_msc_annotation_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_inherit_msc_annotation_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/annotation/"); - if(earResURL != null) { - jpa_core_inherit_msc_annotation_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/annotation/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inherit_msc_annotation_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientStateless3Test.java index 6762cfd7b8..618d220d83 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_msc_annotation_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_inherit_msc_annotation_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_annotation_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_inherit_msc_annotation_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_msc_annotation_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_inherit_msc_annotation_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_msc_annotation_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_inherit_msc_annotation_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_inherit_msc_annotation_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/annotation/"); - if(earResURL != null) { - jpa_core_inherit_msc_annotation_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/annotation/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inherit_msc_annotation_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientAppmanagedTest.java index a794770f5d..461e2ca4f5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_msc_descriptors_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_inherit_msc_descriptors_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_descriptors_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_inherit_msc_descriptors_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_msc_descriptors_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_inherit_msc_descriptors_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_msc_descriptors_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_inherit_msc_descriptors_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_inherit_msc_descriptors_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/descriptors/"); - if(earResURL != null) { - jpa_core_inherit_msc_descriptors_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/descriptors/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inherit_msc_descriptors_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientAppmanagednotxTest.java index f6c0ccc9b7..da2bd723be 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_msc_descriptors_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_inherit_msc_descriptors_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_descriptors_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_inherit_msc_descriptors_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_msc_descriptors_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_inherit_msc_descriptors_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_msc_descriptors_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_inherit_msc_descriptors_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_inherit_msc_descriptors_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/descriptors/"); - if(earResURL != null) { - jpa_core_inherit_msc_descriptors_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/descriptors/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inherit_msc_descriptors_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientPmservletTest.java index 7eda5a0879..4c4c61418b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_inherit_msc_descriptors_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_inherit_msc_descriptors = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_descriptors.jar"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/descriptors/"); - if(earResURL != null) { - jpa_core_inherit_msc_descriptors_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/descriptors/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inherit_msc_descriptors_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientPuservletTest.java index 5e6f905a5d..965a6a9e4c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_inherit_msc_descriptors_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_inherit_msc_descriptors = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_descriptors.jar"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/descriptors/"); - if(earResURL != null) { - jpa_core_inherit_msc_descriptors_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/descriptors/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inherit_msc_descriptors_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientStateful3Test.java index b3f157142f..44ec7a7ba0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_msc_descriptors_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_inherit_msc_descriptors_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_descriptors_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_inherit_msc_descriptors_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_msc_descriptors_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_inherit_msc_descriptors_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_msc_descriptors_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_inherit_msc_descriptors_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_inherit_msc_descriptors_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/descriptors/"); - if(earResURL != null) { - jpa_core_inherit_msc_descriptors_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/descriptors/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inherit_msc_descriptors_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientStateless3Test.java index e00feb7d05..eafa2ba6f4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_msc_descriptors_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_inherit_msc_descriptors_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_descriptors_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_inherit_msc_descriptors_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_msc_descriptors_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_inherit_msc_descriptors_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_msc_descriptors_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_inherit_msc_descriptors_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_inherit_msc_descriptors_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/descriptors/"); - if(earResURL != null) { - jpa_core_inherit_msc_descriptors_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/mappedsc/descriptors/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inherit_msc_descriptors_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientAppmanagedTest.java index 8f6fe98112..024fe9afc9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_nonentity_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_inherit_nonentity_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_nonentity_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_inherit_nonentity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_nonentity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_inherit_nonentity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_nonentity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_inherit_nonentity_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_inherit_nonentity_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/nonentity/"); - if(earResURL != null) { - jpa_core_inherit_nonentity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/nonentity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inherit_nonentity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientAppmanagednotxTest.java index 90b8ab2d54..7a0d4289b5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_nonentity_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_inherit_nonentity_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_nonentity_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_inherit_nonentity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_nonentity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_inherit_nonentity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_nonentity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_inherit_nonentity_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_inherit_nonentity_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/nonentity/"); - if(earResURL != null) { - jpa_core_inherit_nonentity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/nonentity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inherit_nonentity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientPmservletTest.java index 2d3bb8367b..94a9a2fe71 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_inherit_nonentity_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_inherit_nonentity = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_nonentity.jar"); @@ -149,12 +150,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/nonentity/"); - if(earResURL != null) { - jpa_core_inherit_nonentity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/nonentity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inherit_nonentity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientPuservletTest.java index 95253ea9c1..256280d5ab 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_inherit_nonentity_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_inherit_nonentity = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_nonentity.jar"); @@ -149,12 +150,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/nonentity/"); - if(earResURL != null) { - jpa_core_inherit_nonentity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/nonentity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inherit_nonentity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientStateful3Test.java index 26d1e21bd1..f4f3e6a8ee 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_nonentity_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_inherit_nonentity_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_nonentity_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_inherit_nonentity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_nonentity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_inherit_nonentity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_nonentity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_inherit_nonentity_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_inherit_nonentity_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/nonentity/"); - if(earResURL != null) { - jpa_core_inherit_nonentity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/nonentity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inherit_nonentity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientStateless3Test.java index 95f97e0037..df48fb2ecf 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_nonentity_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_inherit_nonentity_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_nonentity_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_inherit_nonentity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_nonentity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_inherit_nonentity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_inherit_nonentity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_inherit_nonentity_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_inherit_nonentity_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/nonentity/"); - if(earResURL != null) { - jpa_core_inherit_nonentity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/inheritance/nonentity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_inherit_nonentity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/entitymanager/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/entitymanager/ClientAppmanagednotxTest.java index 8ee0437f08..267057972e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/entitymanager/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/entitymanager/ClientAppmanagednotxTest.java @@ -92,7 +92,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_lock_entitymanager_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_lock_entitymanager_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_lock_entitymanager_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -117,17 +117,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_lock_entitymanager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_lock_entitymanager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_lock_entitymanager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_lock_entitymanager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_lock_entitymanager_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_lock_entitymanager_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -163,12 +164,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/lock/entitymanager/"); - if(earResURL != null) { - jpa_core_lock_entitymanager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/lock/entitymanager/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_lock_entitymanager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/entitymanager/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/entitymanager/ClientPuservletTest.java index 95dcc97888..9d07e3462d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/entitymanager/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/entitymanager/ClientPuservletTest.java @@ -103,6 +103,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_lock_entitymanager_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_lock_entitymanager = ShrinkWrap.create(JavaArchive.class, "jpa_core_lock_entitymanager.jar"); @@ -136,12 +137,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/lock/entitymanager/"); - if(earResURL != null) { - jpa_core_lock_entitymanager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/lock/entitymanager/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_lock_entitymanager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/query/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/query/ClientAppmanagednotxTest.java index d61d403fec..f0a3f30841 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/query/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/query/ClientAppmanagednotxTest.java @@ -92,7 +92,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_lock_query_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_lock_query_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_lock_query_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -117,17 +117,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_lock_query_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_lock_query_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_lock_query_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_lock_query_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_lock_query_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_lock_query_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -165,12 +166,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/lock/query/"); - if(earResURL != null) { - jpa_core_lock_query_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/lock/query/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_lock_query_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/query/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/query/ClientPuservletTest.java index 5792918577..090557df03 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/query/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/query/ClientPuservletTest.java @@ -103,6 +103,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_lock_query_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_lock_query = ShrinkWrap.create(JavaArchive.class, "jpa_core_lock_query.jar"); @@ -138,12 +139,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/lock/query/"); - if(earResURL != null) { - jpa_core_lock_query_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/lock/query/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_lock_query_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientAppmanagedTest.java index a82f8fdfa9..1efd3bb731 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_attribute_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_attribute_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_attribute_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.attribute.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_attribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_attribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_attribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_attribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_attribute_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_attribute_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/attribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_attribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/attribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_attribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientAppmanagednotxTest.java index 0181f6ec73..7c78488e2c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_attribute_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_attribute_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_attribute_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.attribute.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_attribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_attribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_attribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_attribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_attribute_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_attribute_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/attribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_attribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/attribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_attribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientPmservletTest.java index 69f81ef0e5..6c5aa4ac0e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_attribute_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_attribute = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_attribute.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/attribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_attribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/attribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_attribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientPuservletTest.java index 11a6d8f259..a7a0f69b65 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_attribute_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_attribute = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_attribute.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/attribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_attribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/attribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_attribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientStateful3Test.java index 11f2cb433f..cd24b9e03f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_attribute_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_attribute_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_attribute_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.attribute.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_attribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_attribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_attribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_attribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_attribute_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_attribute_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/attribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_attribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/attribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_attribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientStateless3Test.java index 88e2e000c9..d5ecc867a7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_attribute_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_attribute_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_attribute_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.attribute.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_attribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_attribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_attribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_attribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_attribute_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_attribute_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/attribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_attribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/attribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_attribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientAppmanagedTest.java index a42f137c5f..8ad12ad350 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_basictype_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_basictype_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_basictype_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.basictype.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_basictype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_basictype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_basictype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_basictype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_basictype_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_basictype_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/basictype/"); - if(earResURL != null) { - jpa_core_metamodelapi_basictype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/basictype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_basictype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientAppmanagednotxTest.java index 7063b31534..f8dc62b17a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_basictype_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_basictype_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_basictype_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.basictype.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_basictype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_basictype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_basictype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_basictype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_basictype_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_basictype_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/basictype/"); - if(earResURL != null) { - jpa_core_metamodelapi_basictype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/basictype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_basictype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientPmservletTest.java index 2cf4b8ed8e..86e0256c97 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_basictype_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_basictype = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_basictype.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/basictype/"); - if(earResURL != null) { - jpa_core_metamodelapi_basictype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/basictype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_basictype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientPuservletTest.java index 725e5fa10e..ea7a89b6a1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_basictype_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_basictype = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_basictype.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/basictype/"); - if(earResURL != null) { - jpa_core_metamodelapi_basictype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/basictype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_basictype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientStateful3Test.java index 39757e8110..2eb5fd741b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_basictype_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_basictype_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_basictype_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.basictype.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_basictype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_basictype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_basictype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_basictype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_basictype_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_basictype_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/basictype/"); - if(earResURL != null) { - jpa_core_metamodelapi_basictype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/basictype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_basictype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientStateless3Test.java index fc980f5c88..addcfb6576 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_basictype_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_basictype_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_basictype_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.basictype.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_basictype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_basictype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_basictype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_basictype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_basictype_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_basictype_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/basictype/"); - if(earResURL != null) { - jpa_core_metamodelapi_basictype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/basictype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_basictype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientAppmanagedTest.java index 0065b73aa3..b621b988c6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_bindable_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_bindable_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_bindable_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_bindable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_bindable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_bindable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_bindable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_bindable_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_bindable_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/bindable/"); - if(earResURL != null) { - jpa_core_metamodelapi_bindable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/bindable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_bindable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientAppmanagednotxTest.java index b67d825c06..13978213c6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_bindable_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_bindable_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_bindable_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_bindable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_bindable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_bindable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_bindable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_bindable_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_bindable_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/bindable/"); - if(earResURL != null) { - jpa_core_metamodelapi_bindable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/bindable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_bindable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientPmservletTest.java index 83baa34ccd..ac6d31181d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_bindable_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_bindable = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_bindable.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/bindable/"); - if(earResURL != null) { - jpa_core_metamodelapi_bindable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/bindable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_bindable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientPuservletTest.java index f32c11d0fb..af9f0d8046 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_bindable_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_bindable = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_bindable.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/bindable/"); - if(earResURL != null) { - jpa_core_metamodelapi_bindable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/bindable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_bindable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientStateful3Test.java index 45b341c2f5..5e67cd0889 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_bindable_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_bindable_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_bindable_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_bindable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_bindable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_bindable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_bindable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_bindable_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_bindable_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/bindable/"); - if(earResURL != null) { - jpa_core_metamodelapi_bindable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/bindable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_bindable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientStateless3Test.java index 18b2e17893..5da45568a6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_bindable_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_bindable_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_bindable_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_bindable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_bindable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_bindable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_bindable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_bindable_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_bindable_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/bindable/"); - if(earResURL != null) { - jpa_core_metamodelapi_bindable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/bindable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_bindable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientAppmanagedTest.java index 5937071b00..26e8fb7091 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_collectionattribute_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_collectionattribute_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_collectionattribute_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_collectionattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_collectionattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_collectionattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_collectionattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_collectionattribute_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_collectionattribute_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/collectionattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_collectionattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/collectionattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_collectionattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientAppmanagednotxTest.java index 7215233358..24c66fb375 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_collectionattribute_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_collectionattribute_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_collectionattribute_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_collectionattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_collectionattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_collectionattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_collectionattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_collectionattribute_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_collectionattribute_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/collectionattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_collectionattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/collectionattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_collectionattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientPmservletTest.java index e7ba4eb0fb..5dce672d0d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_collectionattribute_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_collectionattribute = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_collectionattribute.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/collectionattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_collectionattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/collectionattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_collectionattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientPuservletTest.java index b13034a558..b546776dc7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_collectionattribute_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_collectionattribute = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_collectionattribute.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/collectionattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_collectionattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/collectionattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_collectionattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientStateful3Test.java index 6bec727afc..23d6d5cf40 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_collectionattribute_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_collectionattribute_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_collectionattribute_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_collectionattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_collectionattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_collectionattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_collectionattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_collectionattribute_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_collectionattribute_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/collectionattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_collectionattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/collectionattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_collectionattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientStateless3Test.java index f5ac3e6b9b..add5fb311a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_collectionattribute_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_collectionattribute_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_collectionattribute_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_collectionattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_collectionattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_collectionattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_collectionattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_collectionattribute_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_collectionattribute_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/collectionattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_collectionattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/collectionattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_collectionattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientAppmanagedTest.java index e3f88162b7..2bbdfe0063 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_embeddabletype_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_embeddabletype_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_embeddabletype_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_embeddabletype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_embeddabletype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_embeddabletype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_embeddabletype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_embeddabletype_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_embeddabletype_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/embeddabletype/"); - if(earResURL != null) { - jpa_core_metamodelapi_embeddabletype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/embeddabletype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_embeddabletype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientAppmanagednotxTest.java index ff804228ef..421bbb2afe 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_embeddabletype_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_embeddabletype_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_embeddabletype_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_embeddabletype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_embeddabletype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_embeddabletype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_embeddabletype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_embeddabletype_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_embeddabletype_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/embeddabletype/"); - if(earResURL != null) { - jpa_core_metamodelapi_embeddabletype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/embeddabletype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_embeddabletype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientPmservletTest.java index aba243c58c..d845029702 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_embeddabletype_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_embeddabletype = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_embeddabletype.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/embeddabletype/"); - if(earResURL != null) { - jpa_core_metamodelapi_embeddabletype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/embeddabletype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_embeddabletype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientPuservletTest.java index 4608a97fc6..89907af1ba 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_embeddabletype_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_embeddabletype = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_embeddabletype.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/embeddabletype/"); - if(earResURL != null) { - jpa_core_metamodelapi_embeddabletype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/embeddabletype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_embeddabletype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientStateful3Test.java index 793d55e90f..9e4148b526 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_embeddabletype_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_embeddabletype_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_embeddabletype_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_embeddabletype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_embeddabletype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_embeddabletype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_embeddabletype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_embeddabletype_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_embeddabletype_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/embeddabletype/"); - if(earResURL != null) { - jpa_core_metamodelapi_embeddabletype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/embeddabletype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_embeddabletype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientStateless3Test.java index dd3ea74e35..d5e7531c9a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_embeddabletype_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_embeddabletype_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_embeddabletype_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_embeddabletype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_embeddabletype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_embeddabletype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_embeddabletype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_embeddabletype_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_embeddabletype_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/embeddabletype/"); - if(earResURL != null) { - jpa_core_metamodelapi_embeddabletype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/embeddabletype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_embeddabletype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientAppmanagedTest.java index 3238d768e1..a5b5905922 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_entitytype_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_entitytype_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_entitytype_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.entitytype.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_entitytype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_entitytype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_entitytype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_entitytype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_entitytype_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_entitytype_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/entitytype/"); - if(earResURL != null) { - jpa_core_metamodelapi_entitytype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/entitytype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_entitytype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientAppmanagednotxTest.java index 1bebd1f8bd..79972e9d4a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_entitytype_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_entitytype_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_entitytype_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.entitytype.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_entitytype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_entitytype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_entitytype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_entitytype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_entitytype_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_entitytype_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/entitytype/"); - if(earResURL != null) { - jpa_core_metamodelapi_entitytype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/entitytype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_entitytype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientPmservletTest.java index d6bca20650..1bd179bffb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_entitytype_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_entitytype = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_entitytype.jar"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/entitytype/"); - if(earResURL != null) { - jpa_core_metamodelapi_entitytype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/entitytype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_entitytype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientPuservletTest.java index 08d408a698..7f4b5f8ad8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_entitytype_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_entitytype = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_entitytype.jar"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/entitytype/"); - if(earResURL != null) { - jpa_core_metamodelapi_entitytype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/entitytype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_entitytype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientStateful3Test.java index 544b657706..a7a4bccf4e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_entitytype_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_entitytype_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_entitytype_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.entitytype.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_entitytype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_entitytype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_entitytype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_entitytype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_entitytype_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_entitytype_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/entitytype/"); - if(earResURL != null) { - jpa_core_metamodelapi_entitytype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/entitytype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_entitytype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientStateless3Test.java index c2848b555f..95b42c0071 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_entitytype_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_entitytype_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_entitytype_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.entitytype.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_entitytype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_entitytype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_entitytype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_entitytype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_entitytype_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_entitytype_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/entitytype/"); - if(earResURL != null) { - jpa_core_metamodelapi_entitytype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/entitytype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_entitytype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientAppmanagedTest.java index 5c16d6206c..be294523d4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_identifiabletype_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_identifiabletype_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_identifiabletype_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_identifiabletype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_identifiabletype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_identifiabletype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_identifiabletype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_identifiabletype_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_identifiabletype_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/"); - if(earResURL != null) { - jpa_core_metamodelapi_identifiabletype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_identifiabletype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientAppmanagednotxTest.java index cecf2c1d81..afa3c53432 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_identifiabletype_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_identifiabletype_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_identifiabletype_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_identifiabletype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_identifiabletype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_identifiabletype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_identifiabletype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_identifiabletype_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_identifiabletype_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/"); - if(earResURL != null) { - jpa_core_metamodelapi_identifiabletype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_identifiabletype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientPmservletTest.java index 82b50a077f..6c71c1597d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_identifiabletype_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_identifiabletype = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_identifiabletype.jar"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/"); - if(earResURL != null) { - jpa_core_metamodelapi_identifiabletype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_identifiabletype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientPuservletTest.java index fa8f400b31..a32bdac154 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_identifiabletype_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_identifiabletype = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_identifiabletype.jar"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/"); - if(earResURL != null) { - jpa_core_metamodelapi_identifiabletype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_identifiabletype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientStateful3Test.java index 549d37219f..905afbcf01 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_identifiabletype_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_identifiabletype_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_identifiabletype_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_identifiabletype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_identifiabletype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_identifiabletype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_identifiabletype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_identifiabletype_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_identifiabletype_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/"); - if(earResURL != null) { - jpa_core_metamodelapi_identifiabletype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_identifiabletype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientStateless3Test.java index 61d4ff31be..6774bc2e5e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_identifiabletype_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_identifiabletype_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_identifiabletype_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_identifiabletype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_identifiabletype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_identifiabletype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_identifiabletype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_identifiabletype_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_identifiabletype_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/"); - if(earResURL != null) { - jpa_core_metamodelapi_identifiabletype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_identifiabletype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientAppmanagedTest.java index e6e8f67e4a..5e64c51059 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_listattribute_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_listattribute_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_listattribute_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_listattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_listattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_listattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_listattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_listattribute_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_listattribute_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/listattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_listattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/listattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_listattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientAppmanagednotxTest.java index 3fc0d79432..eea9749c2a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_listattribute_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_listattribute_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_listattribute_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_listattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_listattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_listattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_listattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_listattribute_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_listattribute_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/listattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_listattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/listattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_listattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientPmservletTest.java index 83129a99a4..3243ca5a56 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_listattribute_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_listattribute = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_listattribute.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/listattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_listattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/listattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_listattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientPuservletTest.java index 7d59a7ca0b..0d0d036385 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_listattribute_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_listattribute = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_listattribute.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/listattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_listattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/listattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_listattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientStateful3Test.java index 2a0c83494d..228f3cff70 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_listattribute_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_listattribute_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_listattribute_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_listattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_listattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_listattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_listattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_listattribute_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_listattribute_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/listattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_listattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/listattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_listattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientStateless3Test.java index b00ee8a23f..94e672b77b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_listattribute_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_listattribute_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_listattribute_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_listattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_listattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_listattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_listattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_listattribute_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_listattribute_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/listattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_listattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/listattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_listattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientAppmanagedTest.java index 5e4176f0c2..be832aadf8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_managedtype_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_managedtype_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_managedtype_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_managedtype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_managedtype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_managedtype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_managedtype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_managedtype_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_managedtype_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -180,12 +181,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/managedtype/"); - if(earResURL != null) { - jpa_core_metamodelapi_managedtype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/managedtype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_managedtype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientAppmanagednotxTest.java index f11e020fca..83b652ea2f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_managedtype_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_managedtype_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_managedtype_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_managedtype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_managedtype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_managedtype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_managedtype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_managedtype_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_managedtype_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -180,12 +181,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/managedtype/"); - if(earResURL != null) { - jpa_core_metamodelapi_managedtype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/managedtype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_managedtype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientPmservletTest.java index d1bff50d75..4991f4c68b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_managedtype_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_managedtype = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_managedtype.jar"); @@ -153,12 +154,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/managedtype/"); - if(earResURL != null) { - jpa_core_metamodelapi_managedtype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/managedtype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_managedtype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientPuservletTest.java index 9b2755bbc1..96026f4454 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_managedtype_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_managedtype = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_managedtype.jar"); @@ -153,12 +154,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/managedtype/"); - if(earResURL != null) { - jpa_core_metamodelapi_managedtype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/managedtype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_managedtype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientStateful3Test.java index fedb717897..c388ed4a8f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_managedtype_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_managedtype_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_managedtype_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_managedtype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_managedtype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_managedtype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_managedtype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_managedtype_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_managedtype_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -180,12 +181,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/managedtype/"); - if(earResURL != null) { - jpa_core_metamodelapi_managedtype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/managedtype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_managedtype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientStateless3Test.java index 330053123d..d5d5e30f7f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_managedtype_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_managedtype_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_managedtype_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_managedtype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_managedtype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_managedtype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_managedtype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_managedtype_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_managedtype_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -180,12 +181,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/managedtype/"); - if(earResURL != null) { - jpa_core_metamodelapi_managedtype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/managedtype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_managedtype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientAppmanagedTest.java index 6c45470a96..5e8dcd485d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_mapattribute_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_mapattribute_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mapattribute_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_mapattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_mapattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_mapattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_mapattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_mapattribute_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_mapattribute_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mapattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_mapattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mapattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_mapattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientAppmanagednotxTest.java index 1c41ffa970..7af5921a8f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_mapattribute_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_mapattribute_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mapattribute_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_mapattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_mapattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_mapattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_mapattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_mapattribute_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_mapattribute_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mapattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_mapattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mapattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_mapattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientPmservletTest.java index ed3e730ccd..bd2f1ca822 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_mapattribute_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_mapattribute = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mapattribute.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mapattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_mapattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mapattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_mapattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientPuservletTest.java index a33b50d1bb..f4d16f7a07 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_mapattribute_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_mapattribute = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mapattribute.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mapattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_mapattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mapattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_mapattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientStateful3Test.java index addda8793f..672f6d38fb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_mapattribute_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_mapattribute_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mapattribute_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_mapattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_mapattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_mapattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_mapattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_mapattribute_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_mapattribute_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mapattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_mapattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mapattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_mapattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientStateless3Test.java index 662269f369..39be575087 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_mapattribute_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_mapattribute_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mapattribute_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_mapattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_mapattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_mapattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_mapattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_mapattribute_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_mapattribute_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mapattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_mapattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mapattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_mapattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientAppmanagedTest.java index 83f9c7cebe..04dba0f7ae 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_mappedsuperclasstype_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_mappedsuperclasstype_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mappedsuperclasstype_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_mappedsuperclasstype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_mappedsuperclasstype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_mappedsuperclasstype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_mappedsuperclasstype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_mappedsuperclasstype_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_mappedsuperclasstype_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -174,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mappedsuperclasstype/"); - if(earResURL != null) { - jpa_core_metamodelapi_mappedsuperclasstype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mappedsuperclasstype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_mappedsuperclasstype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientAppmanagednotxTest.java index c7e30c0312..db4607e77e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_mappedsuperclasstype_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_mappedsuperclasstype_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mappedsuperclasstype_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_mappedsuperclasstype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_mappedsuperclasstype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_mappedsuperclasstype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_mappedsuperclasstype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_mappedsuperclasstype_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_mappedsuperclasstype_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -174,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mappedsuperclasstype/"); - if(earResURL != null) { - jpa_core_metamodelapi_mappedsuperclasstype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mappedsuperclasstype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_mappedsuperclasstype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientPmservletTest.java index 39279a83e2..3881d147d9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_mappedsuperclasstype_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_mappedsuperclasstype = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mappedsuperclasstype.jar"); @@ -147,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mappedsuperclasstype/"); - if(earResURL != null) { - jpa_core_metamodelapi_mappedsuperclasstype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mappedsuperclasstype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_mappedsuperclasstype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientPuservletTest.java index 18a48e8b32..63aa6a4b27 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_mappedsuperclasstype_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_mappedsuperclasstype = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mappedsuperclasstype.jar"); @@ -147,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mappedsuperclasstype/"); - if(earResURL != null) { - jpa_core_metamodelapi_mappedsuperclasstype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mappedsuperclasstype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_mappedsuperclasstype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientStateful3Test.java index 1b7323e956..f4efe7a7b4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_mappedsuperclasstype_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_mappedsuperclasstype_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mappedsuperclasstype_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_mappedsuperclasstype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_mappedsuperclasstype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_mappedsuperclasstype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_mappedsuperclasstype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_mappedsuperclasstype_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_mappedsuperclasstype_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -174,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mappedsuperclasstype/"); - if(earResURL != null) { - jpa_core_metamodelapi_mappedsuperclasstype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mappedsuperclasstype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_mappedsuperclasstype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientStateless3Test.java index 531e3b5672..0c2a5d2c59 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_mappedsuperclasstype_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_mappedsuperclasstype_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mappedsuperclasstype_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_mappedsuperclasstype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_mappedsuperclasstype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_mappedsuperclasstype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_mappedsuperclasstype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_mappedsuperclasstype_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_mappedsuperclasstype_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -174,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mappedsuperclasstype/"); - if(earResURL != null) { - jpa_core_metamodelapi_mappedsuperclasstype_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/mappedsuperclasstype/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_mappedsuperclasstype_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientAppmanagedTest.java index f7b9e79954..5e0d658750 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_metamodel_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_metamodel_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_metamodel_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_metamodel_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_metamodel_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_metamodel_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_metamodel_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_metamodel_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_metamodel_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/metamodel/"); - if(earResURL != null) { - jpa_core_metamodelapi_metamodel_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/metamodel/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_metamodel_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientAppmanagednotxTest.java index c59175f94b..fbf65690a6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_metamodel_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_metamodel_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_metamodel_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_metamodel_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_metamodel_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_metamodel_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_metamodel_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_metamodel_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_metamodel_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/metamodel/"); - if(earResURL != null) { - jpa_core_metamodelapi_metamodel_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/metamodel/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_metamodel_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientPmservletTest.java index 94b9b3ea75..1d02b52d1c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_metamodel_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_metamodel = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_metamodel.jar"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/metamodel/"); - if(earResURL != null) { - jpa_core_metamodelapi_metamodel_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/metamodel/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_metamodel_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientPuservletTest.java index bd6386cc1f..5f7a358ca8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_metamodel_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_metamodel = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_metamodel.jar"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/metamodel/"); - if(earResURL != null) { - jpa_core_metamodelapi_metamodel_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/metamodel/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_metamodel_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientStateful3Test.java index c6c21ef78a..c32c692299 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_metamodel_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_metamodel_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_metamodel_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_metamodel_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_metamodel_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_metamodel_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_metamodel_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_metamodel_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_metamodel_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/metamodel/"); - if(earResURL != null) { - jpa_core_metamodelapi_metamodel_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/metamodel/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_metamodel_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientStateless3Test.java index 72ebfaf19c..f4cbc61517 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_metamodel_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_metamodel_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_metamodel_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_metamodel_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_metamodel_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_metamodel_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_metamodel_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_metamodel_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_metamodel_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/metamodel/"); - if(earResURL != null) { - jpa_core_metamodelapi_metamodel_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/metamodel/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_metamodel_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientAppmanagedTest.java index 529be57863..cb486caafc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_pluralattribute_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_pluralattribute_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_pluralattribute_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_pluralattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_pluralattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_pluralattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_pluralattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_pluralattribute_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_pluralattribute_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/pluralattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_pluralattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/pluralattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_pluralattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientAppmanagednotxTest.java index f3ffad617e..349b37c44c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_pluralattribute_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_pluralattribute_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_pluralattribute_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_pluralattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_pluralattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_pluralattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_pluralattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_pluralattribute_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_pluralattribute_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/pluralattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_pluralattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/pluralattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_pluralattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientPmservletTest.java index 14aa8d5e02..7b65204554 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_pluralattribute_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_pluralattribute = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_pluralattribute.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/pluralattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_pluralattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/pluralattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_pluralattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientPuservletTest.java index c969ef49dd..79f15b54be 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_pluralattribute_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_pluralattribute = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_pluralattribute.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/pluralattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_pluralattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/pluralattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_pluralattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientStateful3Test.java index ff5ad4c4fb..ffefd7f1ac 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_pluralattribute_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_pluralattribute_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_pluralattribute_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_pluralattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_pluralattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_pluralattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_pluralattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_pluralattribute_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_pluralattribute_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/pluralattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_pluralattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/pluralattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_pluralattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientStateless3Test.java index e0f8221aaf..c6ad54345b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_pluralattribute_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_pluralattribute_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_pluralattribute_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_pluralattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_pluralattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_pluralattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_pluralattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_pluralattribute_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_pluralattribute_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/pluralattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_pluralattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/pluralattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_pluralattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientAppmanagedTest.java index 96abed7998..fbf054a6d6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_setattribute_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_setattribute_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_setattribute_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_setattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_setattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_setattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_setattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_setattribute_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_setattribute_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/setattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_setattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/setattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_setattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientAppmanagednotxTest.java index 578b3a2249..8fdc9caeb9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_setattribute_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_setattribute_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_setattribute_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_setattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_setattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_setattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_setattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_setattribute_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_setattribute_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/setattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_setattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/setattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_setattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientPmservletTest.java index 28bb12de1f..c21db21e4c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_setattribute_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_setattribute = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_setattribute.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/setattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_setattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/setattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_setattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientPuservletTest.java index 47bc443eb9..f80cc22492 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_setattribute_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_setattribute = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_setattribute.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/setattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_setattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/setattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_setattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientStateful3Test.java index d2cba7c101..bccebd97bd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_setattribute_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_setattribute_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_setattribute_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_setattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_setattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_setattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_setattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_setattribute_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_setattribute_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/setattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_setattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/setattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_setattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientStateless3Test.java index 75cd7d402a..e054b79e4b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_setattribute_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_setattribute_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_setattribute_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_setattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_setattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_setattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_setattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_setattribute_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_setattribute_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/setattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_setattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/setattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_setattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientAppmanagedTest.java index a4e8c543a8..2d9cbeeafe 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_singularattribute_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_singularattribute_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_singularattribute_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_singularattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_singularattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_singularattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_singularattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_singularattribute_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_singularattribute_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/singularattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_singularattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/singularattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_singularattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientAppmanagednotxTest.java index 1365a2466f..c76c6916bc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_singularattribute_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_singularattribute_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_singularattribute_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_singularattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_singularattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_singularattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_singularattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_singularattribute_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_singularattribute_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/singularattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_singularattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/singularattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_singularattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientPmservletTest.java index b5db4da046..3d404b7b68 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_singularattribute_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_singularattribute = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_singularattribute.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/singularattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_singularattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/singularattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_singularattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientPuservletTest.java index 083c364506..9c35133795 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_singularattribute_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_singularattribute = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_singularattribute.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/singularattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_singularattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/singularattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_singularattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientStateful3Test.java index d2eda475b2..57aed99645 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_singularattribute_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_singularattribute_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_singularattribute_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_singularattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_singularattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_singularattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_singularattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_singularattribute_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_singularattribute_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/singularattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_singularattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/singularattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_singularattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientStateless3Test.java index 0b47e94623..c9526ad6c1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_singularattribute_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_singularattribute_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_singularattribute_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_singularattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_singularattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_singularattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_singularattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_singularattribute_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_singularattribute_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/singularattribute/"); - if(earResURL != null) { - jpa_core_metamodelapi_singularattribute_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/singularattribute/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_singularattribute_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientAppmanagedTest.java index b0327f0cea..47ee9dcb84 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_type_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_type_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_type_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_type_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_type_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_type_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_type_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_type_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_type_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/type/"); - if(earResURL != null) { - jpa_core_metamodelapi_type_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/type/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_type_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientAppmanagednotxTest.java index 3a21c9e5b4..2b434f86dd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_type_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_type_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_type_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_type_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_type_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_type_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_type_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_type_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_type_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/type/"); - if(earResURL != null) { - jpa_core_metamodelapi_type_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/type/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_type_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientPmservletTest.java index 4f349edcb8..889cd2a005 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_type_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_type = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_type.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/type/"); - if(earResURL != null) { - jpa_core_metamodelapi_type_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/type/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_type_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientPuservletTest.java index 46e8dce6e9..1d94494aa3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_metamodelapi_type_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_type = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_type.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/type/"); - if(earResURL != null) { - jpa_core_metamodelapi_type_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/type/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_type_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientStateful3Test.java index 1a66990118..14f524dea6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_type_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_type_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_type_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_type_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_type_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_type_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_type_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_type_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_type_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/type/"); - if(earResURL != null) { - jpa_core_metamodelapi_type_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/type/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_type_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientStateless3Test.java index 67c04eb635..8bfe4812c4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_type_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_metamodelapi_type_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_type_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_type_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_type_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_metamodelapi_type_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_metamodelapi_type_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_metamodelapi_type_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_metamodelapi_type_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/type/"); - if(earResURL != null) { - jpa_core_metamodelapi_type_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/metamodelapi/type/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_metamodelapi_type_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientAppmanagedTest.java index e84a0a7553..a1c7ee7026 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_nestedembedding_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_nestedembedding_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_nestedembedding_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_nestedembedding_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_nestedembedding_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_nestedembedding_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_nestedembedding_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_nestedembedding_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_nestedembedding_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/nestedembedding/"); - if(earResURL != null) { - jpa_core_nestedembedding_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/nestedembedding/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_nestedembedding_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientAppmanagednotxTest.java index dd90f1945a..7ad64dffbc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_nestedembedding_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_nestedembedding_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_nestedembedding_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_nestedembedding_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_nestedembedding_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_nestedembedding_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_nestedembedding_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_nestedembedding_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_nestedembedding_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/nestedembedding/"); - if(earResURL != null) { - jpa_core_nestedembedding_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/nestedembedding/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_nestedembedding_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientPmservletTest.java index e2c783705c..6a8b8d7076 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_nestedembedding_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_nestedembedding = ShrinkWrap.create(JavaArchive.class, "jpa_core_nestedembedding.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/nestedembedding/"); - if(earResURL != null) { - jpa_core_nestedembedding_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/nestedembedding/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_nestedembedding_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientPuservletTest.java index 9941a40d7c..1092ee8933 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_nestedembedding_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_nestedembedding = ShrinkWrap.create(JavaArchive.class, "jpa_core_nestedembedding.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/nestedembedding/"); - if(earResURL != null) { - jpa_core_nestedembedding_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/nestedembedding/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_nestedembedding_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientStateful3Test.java index 7dc356ed6d..cfda6854eb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_nestedembedding_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_nestedembedding_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_nestedembedding_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_nestedembedding_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_nestedembedding_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_nestedembedding_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_nestedembedding_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_nestedembedding_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_nestedembedding_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/nestedembedding/"); - if(earResURL != null) { - jpa_core_nestedembedding_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/nestedembedding/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_nestedembedding_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientStateless3Test.java index c5eee23e03..6902d5ec3b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_nestedembedding_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_nestedembedding_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_nestedembedding_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_nestedembedding_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_nestedembedding_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_nestedembedding_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_nestedembedding_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_nestedembedding_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_nestedembedding_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/nestedembedding/"); - if(earResURL != null) { - jpa_core_nestedembedding_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/nestedembedding/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_nestedembedding_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientAppmanagedTest.java index f2b977a532..598768b408 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_attributeoverride_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_attributeoverride_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_attributeoverride_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_attributeoverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_attributeoverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_attributeoverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_attributeoverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_attributeoverride_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_attributeoverride_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/attributeoverride/"); - if(earResURL != null) { - jpa_core_override_attributeoverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/attributeoverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_attributeoverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientAppmanagednotxTest.java index 64a4a9b4d0..f4aa1a8278 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_attributeoverride_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_attributeoverride_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_attributeoverride_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_attributeoverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_attributeoverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_attributeoverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_attributeoverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_attributeoverride_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_attributeoverride_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/attributeoverride/"); - if(earResURL != null) { - jpa_core_override_attributeoverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/attributeoverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_attributeoverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientPmservletTest.java index c95bc9d992..e678b54a8f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_override_attributeoverride_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_override_attributeoverride = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_attributeoverride.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/attributeoverride/"); - if(earResURL != null) { - jpa_core_override_attributeoverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/attributeoverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_attributeoverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientPuservletTest.java index da80fb3d97..bf6e27f019 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_override_attributeoverride_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_override_attributeoverride = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_attributeoverride.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/attributeoverride/"); - if(earResURL != null) { - jpa_core_override_attributeoverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/attributeoverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_attributeoverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientStateful3Test.java index 60a0014464..a5843c6fde 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_attributeoverride_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_attributeoverride_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_attributeoverride_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_attributeoverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_attributeoverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_attributeoverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_attributeoverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_attributeoverride_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_attributeoverride_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/attributeoverride/"); - if(earResURL != null) { - jpa_core_override_attributeoverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/attributeoverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_attributeoverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientStateless3Test.java index 5be2dd9f86..68f6d54daa 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_attributeoverride_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_attributeoverride_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_attributeoverride_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_attributeoverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_attributeoverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_attributeoverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_attributeoverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_attributeoverride_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_attributeoverride_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/attributeoverride/"); - if(earResURL != null) { - jpa_core_override_attributeoverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/attributeoverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_attributeoverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientAppmanagedTest.java index 41616922cf..e4ff40cae5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_callbacklistener_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_callbacklistener_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_callbacklistener_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_callbacklistener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_callbacklistener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_callbacklistener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_callbacklistener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_callbacklistener_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_callbacklistener_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/callbacklistener/"); - if(earResURL != null) { - jpa_core_override_callbacklistener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/callbacklistener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_callbacklistener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientAppmanagednotxTest.java index 38fd9abda2..ed88c77e80 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_callbacklistener_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_callbacklistener_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_callbacklistener_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_callbacklistener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_callbacklistener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_callbacklistener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_callbacklistener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_callbacklistener_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_callbacklistener_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/callbacklistener/"); - if(earResURL != null) { - jpa_core_override_callbacklistener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/callbacklistener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_callbacklistener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientPmservletTest.java index 6e50dd64d4..22f58a2da7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_override_callbacklistener_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_override_callbacklistener = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_callbacklistener.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/callbacklistener/"); - if(earResURL != null) { - jpa_core_override_callbacklistener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/callbacklistener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_callbacklistener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientPuservletTest.java index f0440bbb61..5add97610b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_override_callbacklistener_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_override_callbacklistener = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_callbacklistener.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/callbacklistener/"); - if(earResURL != null) { - jpa_core_override_callbacklistener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/callbacklistener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_callbacklistener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientStateful3Test.java index 56b6288fb7..b5e28a0885 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_callbacklistener_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_callbacklistener_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_callbacklistener_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_callbacklistener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_callbacklistener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_callbacklistener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_callbacklistener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_callbacklistener_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_callbacklistener_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/callbacklistener/"); - if(earResURL != null) { - jpa_core_override_callbacklistener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/callbacklistener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_callbacklistener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientStateless3Test.java index 8ba7a75f8a..c426437e03 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_callbacklistener_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_callbacklistener_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_callbacklistener_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_callbacklistener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_callbacklistener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_callbacklistener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_callbacklistener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_callbacklistener_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_callbacklistener_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/callbacklistener/"); - if(earResURL != null) { - jpa_core_override_callbacklistener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/callbacklistener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_callbacklistener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientAppmanagedTest.java index ffcacebb23..c46c27a2a4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_embeddable_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_embeddable_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_embeddable_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_embeddable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_embeddable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_embeddable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_embeddable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_embeddable_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_embeddable_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -177,12 +178,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/embeddable/"); - if(earResURL != null) { - jpa_core_override_embeddable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/embeddable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_embeddable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientAppmanagednotxTest.java index c50b6eecbd..7490964b40 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_embeddable_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_embeddable_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_embeddable_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_embeddable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_embeddable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_embeddable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_embeddable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_embeddable_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_embeddable_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -177,12 +178,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/embeddable/"); - if(earResURL != null) { - jpa_core_override_embeddable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/embeddable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_embeddable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientPmservletTest.java index 5221b97064..4e6ee3ec84 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_override_embeddable_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_override_embeddable = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_embeddable.jar"); @@ -150,12 +151,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/embeddable/"); - if(earResURL != null) { - jpa_core_override_embeddable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/embeddable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_embeddable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientPuservletTest.java index 772200aa2c..c05dd74a6c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_override_embeddable_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_override_embeddable = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_embeddable.jar"); @@ -150,12 +151,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/embeddable/"); - if(earResURL != null) { - jpa_core_override_embeddable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/embeddable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_embeddable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientStateful3Test.java index 2af531ecd2..d2a38e9ebd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_embeddable_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_embeddable_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_embeddable_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_embeddable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_embeddable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_embeddable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_embeddable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_embeddable_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_embeddable_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -177,12 +178,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/embeddable/"); - if(earResURL != null) { - jpa_core_override_embeddable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/embeddable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_embeddable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientStateless3Test.java index d0e5dc4b0d..3e5e0a8f91 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_embeddable_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_embeddable_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_embeddable_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_embeddable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_embeddable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_embeddable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_embeddable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_embeddable_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_embeddable_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -177,12 +178,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/embeddable/"); - if(earResURL != null) { - jpa_core_override_embeddable_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/embeddable/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_embeddable_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientAppmanagedTest.java index 0799e5b655..f0beeb4d82 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientAppmanagedTest.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_entity_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_entity_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entity_appmanaged_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_entity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_entity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_entity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_entity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_entity_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_entity_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -185,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entity/"); - if(earResURL != null) { - jpa_core_override_entity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_entity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientAppmanagednotxTest.java index 3dc228f30b..7393c55999 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientAppmanagednotxTest.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_entity_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_entity_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entity_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_entity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_entity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_entity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_entity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_entity_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_entity_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -185,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entity/"); - if(earResURL != null) { - jpa_core_override_entity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_entity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientPmservletTest.java index c670bd5fcd..4f43ca53c4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientPmservletTest.java @@ -122,6 +122,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_override_entity_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_override_entity = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entity.jar"); @@ -158,12 +159,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entity/"); - if(earResURL != null) { - jpa_core_override_entity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_entity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientPuservletTest.java index ac98075e0d..ad427b6e42 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientPuservletTest.java @@ -122,6 +122,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_override_entity_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_override_entity = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entity.jar"); @@ -158,12 +159,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entity/"); - if(earResURL != null) { - jpa_core_override_entity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_entity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientStateful3Test.java index fd0de796aa..fd307835d4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientStateful3Test.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_entity_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_entity_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entity_stateful3_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_entity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_entity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_entity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_entity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_entity_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_entity_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -185,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entity/"); - if(earResURL != null) { - jpa_core_override_entity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_entity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientStateless3Test.java index 7ab47e9c5c..ffe10ca181 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientStateless3Test.java @@ -111,7 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_entity_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_entity_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entity_stateless3_vehicle_ejb.jar"); // The class files @@ -136,17 +136,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_entity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_entity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_entity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_entity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_entity_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_entity_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -185,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entity/"); - if(earResURL != null) { - jpa_core_override_entity_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entity/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_entity_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientAppmanagedTest.java index 4cae7a66a9..1cf6dd4355 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_entitylistener_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_entitylistener_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entitylistener_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_entitylistener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_entitylistener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_entitylistener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_entitylistener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_entitylistener_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_entitylistener_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -177,12 +178,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entitylistener/"); - if(earResURL != null) { - jpa_core_override_entitylistener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entitylistener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_entitylistener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientAppmanagednotxTest.java index 5e307efe56..dae6f175a0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_entitylistener_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_entitylistener_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entitylistener_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_entitylistener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_entitylistener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_entitylistener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_entitylistener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_entitylistener_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_entitylistener_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -177,12 +178,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entitylistener/"); - if(earResURL != null) { - jpa_core_override_entitylistener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entitylistener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_entitylistener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientPmservletTest.java index fe560f0fb1..33442a0a39 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_override_entitylistener_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_override_entitylistener = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entitylistener.jar"); @@ -150,12 +151,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entitylistener/"); - if(earResURL != null) { - jpa_core_override_entitylistener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entitylistener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_entitylistener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientPuservletTest.java index 6f4954c780..95119e797e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_override_entitylistener_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_override_entitylistener = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entitylistener.jar"); @@ -150,12 +151,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entitylistener/"); - if(earResURL != null) { - jpa_core_override_entitylistener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entitylistener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_entitylistener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientStateful3Test.java index be17452998..41692dfe62 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_entitylistener_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_entitylistener_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entitylistener_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_entitylistener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_entitylistener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_entitylistener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_entitylistener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_entitylistener_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_entitylistener_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -177,12 +178,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entitylistener/"); - if(earResURL != null) { - jpa_core_override_entitylistener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entitylistener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_entitylistener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientStateless3Test.java index c050293e0a..d736bd7055 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_entitylistener_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_entitylistener_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entitylistener_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_entitylistener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_entitylistener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_entitylistener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_entitylistener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_entitylistener_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_entitylistener_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -177,12 +178,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entitylistener/"); - if(earResURL != null) { - jpa_core_override_entitylistener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/entitylistener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_entitylistener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientAppmanagedTest.java index b57478556b..f8b4ca26ca 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_joincolumn_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_joincolumn_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_joincolumn_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_joincolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_joincolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_joincolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_joincolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_joincolumn_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_joincolumn_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/joincolumn/"); - if(earResURL != null) { - jpa_core_override_joincolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/joincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_joincolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientAppmanagednotxTest.java index 6c8e2070cd..85219d005c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_joincolumn_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_joincolumn_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_joincolumn_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_joincolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_joincolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_joincolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_joincolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_joincolumn_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_joincolumn_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/joincolumn/"); - if(earResURL != null) { - jpa_core_override_joincolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/joincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_joincolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientPmservletTest.java index 87f3e055ec..860d13da5b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_override_joincolumn_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_override_joincolumn = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_joincolumn.jar"); @@ -151,12 +152,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/joincolumn/"); - if(earResURL != null) { - jpa_core_override_joincolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/joincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_joincolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientPuservletTest.java index f3df5ee485..1d4b12456d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_override_joincolumn_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_override_joincolumn = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_joincolumn.jar"); @@ -151,12 +152,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/joincolumn/"); - if(earResURL != null) { - jpa_core_override_joincolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/joincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_joincolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientStateful3Test.java index 5ee14c48e6..55217e13da 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_joincolumn_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_joincolumn_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_joincolumn_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_joincolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_joincolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_joincolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_joincolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_joincolumn_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_joincolumn_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/joincolumn/"); - if(earResURL != null) { - jpa_core_override_joincolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/joincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_joincolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientStateless3Test.java index 373b5f8d70..252ff3747e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_joincolumn_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_joincolumn_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_joincolumn_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_joincolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_joincolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_joincolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_joincolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_joincolumn_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_joincolumn_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -178,12 +179,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/joincolumn/"); - if(earResURL != null) { - jpa_core_override_joincolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/joincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_joincolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientAppmanagedTest.java index f5a9aa0c36..bc084e0e4f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_manytomany_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_manytomany_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_manytomany_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_manytomany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_manytomany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_manytomany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_manytomany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_manytomany_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_manytomany_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/manytomany/"); - if(earResURL != null) { - jpa_core_override_manytomany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/manytomany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_manytomany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientAppmanagednotxTest.java index 3730e06ca2..9034d44998 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_manytomany_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_manytomany_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_manytomany_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_manytomany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_manytomany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_manytomany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_manytomany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_manytomany_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_manytomany_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/manytomany/"); - if(earResURL != null) { - jpa_core_override_manytomany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/manytomany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_manytomany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientPmservletTest.java index 9b2fb63f27..6b087e19e1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_override_manytomany_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_override_manytomany = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_manytomany.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/manytomany/"); - if(earResURL != null) { - jpa_core_override_manytomany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/manytomany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_manytomany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientPuservletTest.java index 790cfca9df..6383947291 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_override_manytomany_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_override_manytomany = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_manytomany.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/manytomany/"); - if(earResURL != null) { - jpa_core_override_manytomany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/manytomany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_manytomany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientStateful3Test.java index 7be37b9dc1..3cc1cea4ae 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_manytomany_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_manytomany_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_manytomany_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_manytomany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_manytomany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_manytomany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_manytomany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_manytomany_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_manytomany_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/manytomany/"); - if(earResURL != null) { - jpa_core_override_manytomany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/manytomany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_manytomany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientStateless3Test.java index 105472d1de..4a8334d639 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_manytomany_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_manytomany_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_manytomany_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_manytomany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_manytomany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_manytomany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_manytomany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_manytomany_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_manytomany_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/manytomany/"); - if(earResURL != null) { - jpa_core_override_manytomany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/manytomany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_manytomany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientAppmanagedTest.java index 95927588a4..ee9e95f816 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_mapkey_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_mapkey_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_mapkey_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_mapkey_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_mapkey_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_mapkey_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_mapkey_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_mapkey_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_mapkey_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -179,12 +180,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/mapkey/"); - if(earResURL != null) { - jpa_core_override_mapkey_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/mapkey/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_mapkey_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientAppmanagednotxTest.java index cb61c7ac78..63fb6d3cc5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_mapkey_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_mapkey_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_mapkey_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_mapkey_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_mapkey_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_mapkey_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_mapkey_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_mapkey_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_mapkey_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -179,12 +180,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/mapkey/"); - if(earResURL != null) { - jpa_core_override_mapkey_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/mapkey/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_mapkey_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientPmservletTest.java index dcea9696fe..d33f919920 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_override_mapkey_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_override_mapkey = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_mapkey.jar"); @@ -152,12 +153,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/mapkey/"); - if(earResURL != null) { - jpa_core_override_mapkey_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/mapkey/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_mapkey_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientPuservletTest.java index 954107850a..ef599243c3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_override_mapkey_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_override_mapkey = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_mapkey.jar"); @@ -152,12 +153,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/mapkey/"); - if(earResURL != null) { - jpa_core_override_mapkey_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/mapkey/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_mapkey_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientStateful3Test.java index 1337d6d12c..4e2829b1ea 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_mapkey_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_mapkey_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_mapkey_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_mapkey_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_mapkey_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_mapkey_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_mapkey_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_mapkey_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_mapkey_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -179,12 +180,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/mapkey/"); - if(earResURL != null) { - jpa_core_override_mapkey_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/mapkey/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_mapkey_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientStateless3Test.java index 299c2dd1db..a401927a41 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_mapkey_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_mapkey_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_mapkey_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_mapkey_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_mapkey_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_mapkey_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_mapkey_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_mapkey_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_mapkey_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -179,12 +180,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/mapkey/"); - if(earResURL != null) { - jpa_core_override_mapkey_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/mapkey/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_mapkey_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientAppmanagedTest.java index bc18b6099c..2cdf40fa09 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_nocallbacklistener_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_nocallbacklistener_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_nocallbacklistener_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_nocallbacklistener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_nocallbacklistener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_nocallbacklistener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_nocallbacklistener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_nocallbacklistener_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_nocallbacklistener_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/nocallbacklistener/"); - if(earResURL != null) { - jpa_core_override_nocallbacklistener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/nocallbacklistener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_nocallbacklistener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientAppmanagednotxTest.java index b637ab4df2..7a6eb2dacb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_nocallbacklistener_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_nocallbacklistener_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_nocallbacklistener_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_nocallbacklistener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_nocallbacklistener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_nocallbacklistener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_nocallbacklistener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_nocallbacklistener_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_nocallbacklistener_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/nocallbacklistener/"); - if(earResURL != null) { - jpa_core_override_nocallbacklistener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/nocallbacklistener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_nocallbacklistener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientPmservletTest.java index 1d047d723c..02bdb2d424 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_override_nocallbacklistener_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_override_nocallbacklistener = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_nocallbacklistener.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/nocallbacklistener/"); - if(earResURL != null) { - jpa_core_override_nocallbacklistener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/nocallbacklistener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_nocallbacklistener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientPuservletTest.java index 15cdfb9e14..db9ca91d84 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_override_nocallbacklistener_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_override_nocallbacklistener = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_nocallbacklistener.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/nocallbacklistener/"); - if(earResURL != null) { - jpa_core_override_nocallbacklistener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/nocallbacklistener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_nocallbacklistener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientStateful3Test.java index dafe3d447e..10b1dea371 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_nocallbacklistener_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_nocallbacklistener_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_nocallbacklistener_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_nocallbacklistener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_nocallbacklistener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_nocallbacklistener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_nocallbacklistener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_nocallbacklistener_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_nocallbacklistener_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/nocallbacklistener/"); - if(earResURL != null) { - jpa_core_override_nocallbacklistener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/nocallbacklistener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_nocallbacklistener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientStateless3Test.java index 3a95081f30..d9b189a9d9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_nocallbacklistener_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_nocallbacklistener_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_nocallbacklistener_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_nocallbacklistener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_nocallbacklistener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_nocallbacklistener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_nocallbacklistener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_nocallbacklistener_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_nocallbacklistener_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/nocallbacklistener/"); - if(earResURL != null) { - jpa_core_override_nocallbacklistener_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/nocallbacklistener/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_nocallbacklistener_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientAppmanagedTest.java index a9b9ce1da5..7995150334 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_table_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_table_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_table_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_table_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_table_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_table_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_table_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_table_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_table_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/table/"); - if(earResURL != null) { - jpa_core_override_table_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/table/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_table_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientAppmanagednotxTest.java index 1270f92eaa..df8d1a1853 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_table_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_table_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_table_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_table_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_table_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_table_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_table_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_table_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_table_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/table/"); - if(earResURL != null) { - jpa_core_override_table_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/table/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_table_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientPmservletTest.java index 050deae6eb..08f809f08d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_override_table_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_override_table = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_table.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/table/"); - if(earResURL != null) { - jpa_core_override_table_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/table/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_table_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientPuservletTest.java index f85c127ced..202f014365 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_override_table_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_override_table = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_table.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/table/"); - if(earResURL != null) { - jpa_core_override_table_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/table/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_table_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientStateful3Test.java index 8884c848a6..d79008392f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_table_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_table_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_table_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_table_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_table_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_table_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_table_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_table_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_table_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/table/"); - if(earResURL != null) { - jpa_core_override_table_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/table/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_table_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientStateless3Test.java index 27240f82f1..2f3528cceb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_table_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_override_table_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_table_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_override_table_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_override_table_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_override_table_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_override_table_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_override_table_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_override_table_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/table/"); - if(earResURL != null) { - jpa_core_override_table_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/override/table/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_override_table_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientAppmanagedTest.java index 9c3304f1a0..696a26f5f3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_PersistenceUtilUtil_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_PersistenceUtilUtil_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_PersistenceUtilUtil_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_PersistenceUtilUtil_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_PersistenceUtilUtil_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_PersistenceUtilUtil_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_PersistenceUtilUtil_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_PersistenceUtilUtil_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_PersistenceUtilUtil_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtilUtil/"); - if(earResURL != null) { - jpa_core_PersistenceUtilUtil_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtilUtil/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_PersistenceUtilUtil_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientAppmanagednotxTest.java index cd696c3d3a..dfc21d1945 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_PersistenceUtilUtil_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_PersistenceUtilUtil_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_PersistenceUtilUtil_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_PersistenceUtilUtil_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_PersistenceUtilUtil_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_PersistenceUtilUtil_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_PersistenceUtilUtil_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_PersistenceUtilUtil_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_PersistenceUtilUtil_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtilUtil/"); - if(earResURL != null) { - jpa_core_PersistenceUtilUtil_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtilUtil/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_PersistenceUtilUtil_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientPmservletTest.java index 091350d92e..2cb4949a28 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_PersistenceUtilUtil_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_PersistenceUtilUtil = ShrinkWrap.create(JavaArchive.class, "jpa_core_PersistenceUtilUtil.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtilUtil/"); - if(earResURL != null) { - jpa_core_PersistenceUtilUtil_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtilUtil/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_PersistenceUtilUtil_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientPuservletTest.java index 2d8e03b4d9..0ef9fc80c2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_PersistenceUtilUtil_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_PersistenceUtilUtil = ShrinkWrap.create(JavaArchive.class, "jpa_core_PersistenceUtilUtil.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtilUtil/"); - if(earResURL != null) { - jpa_core_PersistenceUtilUtil_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtilUtil/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_PersistenceUtilUtil_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientStateful3Test.java index 08e5616b83..08683e67bb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_PersistenceUtilUtil_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_PersistenceUtilUtil_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_PersistenceUtilUtil_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_PersistenceUtilUtil_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_PersistenceUtilUtil_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_PersistenceUtilUtil_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_PersistenceUtilUtil_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_PersistenceUtilUtil_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_PersistenceUtilUtil_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtilUtil/"); - if(earResURL != null) { - jpa_core_PersistenceUtilUtil_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtilUtil/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_PersistenceUtilUtil_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientStateless3Test.java index 949dd99759..93aac2e90f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_PersistenceUtilUtil_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_PersistenceUtilUtil_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_PersistenceUtilUtil_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_PersistenceUtilUtil_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_PersistenceUtilUtil_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_PersistenceUtilUtil_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_PersistenceUtilUtil_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_PersistenceUtilUtil_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_PersistenceUtilUtil_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtilUtil/"); - if(earResURL != null) { - jpa_core_PersistenceUtilUtil_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtilUtil/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_PersistenceUtilUtil_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientAppmanagedTest.java index 794a5b674f..b8a6bd43ee 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_persistenceUtil_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_persistenceUtil_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_persistenceUtil_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_persistenceUtil_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_persistenceUtil_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_persistenceUtil_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_persistenceUtil_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_persistenceUtil_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_persistenceUtil_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtil/"); - if(earResURL != null) { - jpa_core_persistenceUtil_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtil/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_persistenceUtil_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientAppmanagednotxTest.java index fd74e7007d..13f7511684 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_persistenceUtil_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_persistenceUtil_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_persistenceUtil_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_persistenceUtil_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_persistenceUtil_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_persistenceUtil_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_persistenceUtil_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_persistenceUtil_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_persistenceUtil_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtil/"); - if(earResURL != null) { - jpa_core_persistenceUtil_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtil/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_persistenceUtil_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientPmservletTest.java index 7d59ebffb6..b7ffb578af 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_persistenceUtil_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_persistenceUtil = ShrinkWrap.create(JavaArchive.class, "jpa_core_persistenceUtil.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtil/"); - if(earResURL != null) { - jpa_core_persistenceUtil_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtil/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_persistenceUtil_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientPuservletTest.java index b18c0756e3..cd2c555366 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_persistenceUtil_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_persistenceUtil = ShrinkWrap.create(JavaArchive.class, "jpa_core_persistenceUtil.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtil/"); - if(earResURL != null) { - jpa_core_persistenceUtil_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtil/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_persistenceUtil_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientStateful3Test.java index 3d5cfc7d6c..d7ef97b831 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_persistenceUtil_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_persistenceUtil_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_persistenceUtil_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_persistenceUtil_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_persistenceUtil_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_persistenceUtil_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_persistenceUtil_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_persistenceUtil_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_persistenceUtil_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtil/"); - if(earResURL != null) { - jpa_core_persistenceUtil_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtil/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_persistenceUtil_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientStateless3Test.java index 0c83ba7fc2..ea684d2808 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_persistenceUtil_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_persistenceUtil_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_persistenceUtil_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_persistenceUtil_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_persistenceUtil_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_persistenceUtil_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_persistenceUtil_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_persistenceUtil_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_persistenceUtil_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtil/"); - if(earResURL != null) { - jpa_core_persistenceUtil_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/persistenceUtil/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_persistenceUtil_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1AppmanagednotxTest.java index 940482b7d2..bc72866c41 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1AppmanagednotxTest.java @@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_apitests_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -120,17 +120,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -169,12 +170,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/"); - if(earResURL != null) { - jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1PmservletTest.java index f0cb941cad..eddb871fb3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1PmservletTest.java @@ -106,6 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_apitests_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_apitests = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests.jar"); @@ -142,12 +143,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/"); - if(earResURL != null) { - jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1PuservletTest.java index 091a7a66a4..f66d044641 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1PuservletTest.java @@ -106,6 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_apitests_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_apitests = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests.jar"); @@ -142,12 +143,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/"); - if(earResURL != null) { - jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1Stateless3Test.java index bcb2c4282c..a53e52d6bb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1Stateless3Test.java @@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_apitests_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_apitests_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_stateless3_vehicle_ejb.jar"); // The class files @@ -120,17 +120,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_apitests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_apitests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_apitests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_apitests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_apitests_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_apitests_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -169,12 +170,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/"); - if(earResURL != null) { - jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2AppmanagednotxTest.java index e1fcd5ab1a..c5562c9bfb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2AppmanagednotxTest.java @@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_apitests_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -120,17 +120,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -169,12 +170,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/"); - if(earResURL != null) { - jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2PmservletTest.java index cbf02c4052..c1054a36e3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2PmservletTest.java @@ -106,6 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_apitests_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_apitests = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests.jar"); @@ -142,12 +143,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/"); - if(earResURL != null) { - jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2PuservletTest.java index e902d0f674..ae66a4d4a1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2PuservletTest.java @@ -106,6 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_apitests_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_apitests = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests.jar"); @@ -142,12 +143,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/"); - if(earResURL != null) { - jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2Stateless3Test.java index 2f03870ddc..44c8a334b8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2Stateless3Test.java @@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_apitests_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_apitests_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_stateless3_vehicle_ejb.jar"); // The class files @@ -120,17 +120,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_apitests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_apitests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_apitests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_apitests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_apitests_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_apitests_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -169,12 +170,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/"); - if(earResURL != null) { - jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3AppmanagednotxTest.java index c4fd587b9a..8e21506356 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3AppmanagednotxTest.java @@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_apitests_appmanagedNoTx_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -120,17 +120,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -169,12 +170,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/"); - if(earResURL != null) { - jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3PmservletTest.java index ea2d4c2e1e..d536c63ffb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3PmservletTest.java @@ -106,6 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_apitests_pmservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_apitests = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests.jar"); @@ -142,12 +143,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/"); - if(earResURL != null) { - jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3PuservletTest.java index 5d76fc08ce..3928357b6b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3PuservletTest.java @@ -106,6 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_apitests_puservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_apitests = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests.jar"); @@ -142,12 +143,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/"); - if(earResURL != null) { - jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3Stateless3Test.java index 454ba930b4..401e85b0e4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3Stateless3Test.java @@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_apitests_stateless3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_apitests_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_stateless3_vehicle_ejb.jar"); // The class files @@ -120,17 +120,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_apitests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_apitests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_apitests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_apitests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_apitests_stateless3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_apitests_stateless3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -169,12 +170,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/"); - if(earResURL != null) { - jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4AppmanagednotxTest.java index d22703ac71..22409ab205 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4AppmanagednotxTest.java @@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_apitests_appmanagedNoTx_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -120,17 +120,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_apitests_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -169,12 +170,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/"); - if(earResURL != null) { - jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4PmservletTest.java index db29301679..97af876518 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4PmservletTest.java @@ -106,6 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_apitests_pmservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_apitests = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests.jar"); @@ -142,12 +143,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/"); - if(earResURL != null) { - jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4PuservletTest.java index 0e89c9e84e..3b316d6232 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4PuservletTest.java @@ -106,6 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_apitests_puservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_apitests = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests.jar"); @@ -142,12 +143,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/"); - if(earResURL != null) { - jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4Stateless3Test.java index 944fa61ebd..a46a2540ab 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4Stateless3Test.java @@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_apitests_stateless3_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_apitests_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_stateless3_vehicle_ejb.jar"); // The class files @@ -120,17 +120,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_apitests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_apitests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_apitests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_apitests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_apitests_stateless3_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_apitests_stateless3_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -169,12 +170,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/"); - if(earResURL != null) { - jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/query/apitests/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_apitests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1AppmanagednotxTest.java index d29844431f..fb864a0090 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1AppmanagednotxTest.java @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_flushmode_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -122,17 +122,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -185,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/"); - if(earResURL != null) { - jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1PmservletTest.java index 64662996c3..765aa0054b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1PmservletTest.java @@ -107,6 +107,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_flushmode_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_flushmode = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode.jar"); @@ -157,12 +158,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/"); - if(earResURL != null) { - jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1PuservletTest.java index 9f21c2fd64..f544fd849a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1PuservletTest.java @@ -107,6 +107,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_flushmode_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_flushmode = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode.jar"); @@ -157,12 +158,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/"); - if(earResURL != null) { - jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1Stateless3Test.java index 30e6313941..44c068eb11 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1Stateless3Test.java @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_flushmode_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_flushmode_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode_stateless3_vehicle_ejb.jar"); // The class files @@ -122,17 +122,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_flushmode_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_flushmode_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_flushmode_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_flushmode_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_flushmode_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_flushmode_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -185,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/"); - if(earResURL != null) { - jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2AppmanagednotxTest.java index 213a71ec20..09d05edc38 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2AppmanagednotxTest.java @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_flushmode_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -122,17 +122,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -185,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/"); - if(earResURL != null) { - jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2PmservletTest.java index 1376cf0f0c..5d808f64f4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2PmservletTest.java @@ -107,6 +107,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_flushmode_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_flushmode = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode.jar"); @@ -157,12 +158,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/"); - if(earResURL != null) { - jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2PuservletTest.java index f173c333b6..41ec272ca5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2PuservletTest.java @@ -107,6 +107,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_flushmode_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_flushmode = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode.jar"); @@ -157,12 +158,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/"); - if(earResURL != null) { - jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2Stateless3Test.java index ae222878e9..be0655e10a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2Stateless3Test.java @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_flushmode_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_flushmode_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode_stateless3_vehicle_ejb.jar"); // The class files @@ -122,17 +122,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_flushmode_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_flushmode_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_flushmode_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_flushmode_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_flushmode_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_flushmode_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -185,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/"); - if(earResURL != null) { - jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3AppmanagednotxTest.java index 132f8123a1..049a844959 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3AppmanagednotxTest.java @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_flushmode_appmanagedNoTx_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -122,17 +122,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_flushmode_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -185,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/"); - if(earResURL != null) { - jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3PmservletTest.java index d2f6c97fae..890cc52f50 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3PmservletTest.java @@ -107,6 +107,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_flushmode_pmservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_flushmode = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode.jar"); @@ -157,12 +158,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/"); - if(earResURL != null) { - jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3PuservletTest.java index da89cb597f..0986b959c9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3PuservletTest.java @@ -107,6 +107,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_flushmode_puservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_flushmode = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode.jar"); @@ -157,12 +158,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/"); - if(earResURL != null) { - jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3Stateless3Test.java index 874d6ec747..a1bbce32ae 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3Stateless3Test.java @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_flushmode_stateless3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_flushmode_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode_stateless3_vehicle_ejb.jar"); // The class files @@ -122,17 +122,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_flushmode_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_flushmode_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_flushmode_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_flushmode_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_flushmode_stateless3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_flushmode_stateless3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -185,12 +186,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/"); - if(earResURL != null) { - jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/flushmode/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_flushmode_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1AppmanagedTest.java index 952114ba81..5bb4e87284 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1AppmanagednotxTest.java index 697e43e2bf..2040dd28c3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1PmservletTest.java index 430a28fc09..d3547e49b2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_language_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_language = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language.jar"); @@ -161,12 +162,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1PuservletTest.java index 467a7ba584..4f69b25237 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_language_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_language = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language.jar"); @@ -161,12 +162,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1Stateful3Test.java index f9b90b9194..d389b8b6e2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1Stateless3Test.java index fd0a1d7073..0317891977 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2AppmanagedTest.java index ad63f30317..7dfe54e490 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2AppmanagednotxTest.java index e474257533..8246e857e1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2PmservletTest.java index e3c38934ee..1797dd3036 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_language_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_language = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language.jar"); @@ -161,12 +162,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2PuservletTest.java index 8d5cfe0376..aa03a8c5b6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_language_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_language = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language.jar"); @@ -161,12 +162,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2Stateful3Test.java index 8698f08014..c026f5491b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2Stateless3Test.java index 923d04b998..c7f18695a7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3AppmanagedTest.java index 65d4ab2249..f9ba9186e7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanaged_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_appmanaged_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_appmanaged_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3AppmanagednotxTest.java index 7dd34bc631..82b645488f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanagedNoTx_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3PmservletTest.java index dbbdccffda..6df8979927 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_language_pmservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_language = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language.jar"); @@ -161,12 +162,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3PuservletTest.java index 255970e562..3302d31b1e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_language_puservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_language = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language.jar"); @@ -161,12 +162,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3Stateful3Test.java index 099accd26f..e794d27d4b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateful3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_stateful3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_stateful3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3Stateless3Test.java index 44550f414c..2532d19279 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateless3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_stateless3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_stateless3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4AppmanagedTest.java index 2e5fbd832f..e949d46626 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanaged_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_appmanaged_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_appmanaged_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4AppmanagednotxTest.java index cec1ff9565..0903f61c90 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanagedNoTx_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4PmservletTest.java index 8da669bb16..650364d77a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_language_pmservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_language = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language.jar"); @@ -161,12 +162,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4PuservletTest.java index 654fe92419..54db38860a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_language_puservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_language = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language.jar"); @@ -161,12 +162,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4Stateful3Test.java index a3ffabaa03..f02c71b6db 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateful3_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_stateful3_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_stateful3_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4Stateless3Test.java index 8e7bb3448a..e9106db8ec 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateless3_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_stateless3_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_stateless3_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5AppmanagedTest.java index 554abd58d5..352ad24b2d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanaged_vehicle_client, Client5.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.query.language.Client5.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client5.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client5.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client5.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client5.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_appmanaged_vehicle_ejb, Client5.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_appmanaged_vehicle_ejb, Client5.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5AppmanagednotxTest.java index a83311296a..8368ffcb9a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanagedNoTx_vehicle_client, Client5.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client5.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client5.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client5.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client5.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_appmanagedNoTx_vehicle_ejb, Client5.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_appmanagedNoTx_vehicle_ejb, Client5.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5PmservletTest.java index 4d389b9816..ae35bc4611 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_language_pmservlet_vehicle_web, Client5.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_language = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language.jar"); @@ -161,12 +162,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5PuservletTest.java index 2762570788..8ee8337607 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_language_puservlet_vehicle_web, Client5.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_language = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language.jar"); @@ -161,12 +162,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5Stateful3Test.java index d3ba16704b..bf6f515ba9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateful3_vehicle_client, Client5.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.query.language.Client5.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client5.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client5.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client5.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client5.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_stateful3_vehicle_ejb, Client5.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_stateful3_vehicle_ejb, Client5.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5Stateless3Test.java index 7f4e452287..eba66003b7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateless3_vehicle_client, Client5.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.query.language.Client5.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client5.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client5.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client5.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client5.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_stateless3_vehicle_ejb, Client5.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_stateless3_vehicle_ejb, Client5.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client5.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6AppmanagedTest.java index 334174dacd..8a5ff25381 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6AppmanagedTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanaged_vehicle_client, Client6.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanaged_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client6.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client6.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client6.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client6.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_appmanaged_vehicle_ejb, Client6.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_appmanaged_vehicle_ejb, Client6.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6AppmanagednotxTest.java index 5545b80dbf..0365523fe6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6AppmanagednotxTest.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanagedNoTx_vehicle_client, Client6.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client6.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client6.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client6.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client6.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_appmanagedNoTx_vehicle_ejb, Client6.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_appmanagedNoTx_vehicle_ejb, Client6.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6PmservletTest.java index d0cfe8aa53..e2dbb635d3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6PmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_language_pmservlet_vehicle_web, Client6.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_language = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language.jar"); @@ -161,12 +162,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6PuservletTest.java index ab40ac0799..2717c7bcd6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6PuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_language_puservlet_vehicle_web, Client6.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_language = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language.jar"); @@ -161,12 +162,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6Stateful3Test.java index f5fa8c36f8..95c79041ae 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6Stateful3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateful3_vehicle_client, Client6.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateful3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client6.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client6.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client6.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client6.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_stateful3_vehicle_ejb, Client6.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_stateful3_vehicle_ejb, Client6.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6Stateless3Test.java index d86aff8ec4..d804f71980 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6Stateless3Test.java @@ -100,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateless3_vehicle_client, Client6.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_language_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateless3_vehicle_ejb.jar"); // The class files @@ -126,17 +126,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client6.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client6.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client6.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client6.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_language_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_language_stateless3_vehicle_ejb, Client6.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_language_stateless3_vehicle_ejb, Client6.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -189,12 +190,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/query/language/"); - if(earResURL != null) { - jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/com/sun/ts/tests/jpa/core/query/language/.ear.sun-application.xml"); + earResURL = Client6.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_language_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1AppmanagedTest.java index 667ebbfa59..36ce18a9ea 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1AppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_parameter_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_parameter_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_parameter_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_parameter_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_parameter_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_parameter_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_parameter_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_parameter_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/"); - if(earResURL != null) { - jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1AppmanagednotxTest.java index 4196dfd8c8..9bd3e63231 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1AppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_parameter_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_parameter_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_parameter_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_parameter_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_parameter_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_parameter_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_parameter_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_parameter_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/"); - if(earResURL != null) { - jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1PmservletTest.java index 9149d8ab80..645d71b147 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1PmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_parameter_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_parameter = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/"); - if(earResURL != null) { - jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1PuservletTest.java index 86e60d479c..7c63692aa9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1PuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_parameter_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_parameter = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/"); - if(earResURL != null) { - jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1Stateful3Test.java index 3427e897d8..f8c73c15b6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1Stateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_parameter_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_parameter_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_parameter_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_parameter_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_parameter_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_parameter_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_parameter_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_parameter_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/"); - if(earResURL != null) { - jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1Stateless3Test.java index f4b4cdf853..e8d07ec2b9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1Stateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_parameter_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_parameter_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_parameter_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_parameter_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_parameter_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_parameter_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_parameter_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_parameter_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/"); - if(earResURL != null) { - jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2AppmanagedTest.java index 3f244cb451..bd8a1b94f4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2AppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_parameter_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_parameter_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_parameter_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_parameter_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_parameter_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_parameter_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_parameter_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_parameter_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/"); - if(earResURL != null) { - jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2AppmanagednotxTest.java index 5cb76c675d..db92e7bbcd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2AppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_parameter_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_parameter_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_parameter_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_parameter_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_parameter_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_parameter_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_parameter_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_parameter_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/"); - if(earResURL != null) { - jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2PmservletTest.java index c21beb5078..2ab1e6333a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2PmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_parameter_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_parameter = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/"); - if(earResURL != null) { - jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2PuservletTest.java index a2b5a10739..f763e48d32 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2PuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_query_parameter_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_query_parameter = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/"); - if(earResURL != null) { - jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2Stateful3Test.java index b79fd108d9..d1d1c0fb3b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2Stateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_parameter_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_parameter_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_parameter_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_parameter_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_parameter_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_parameter_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_parameter_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_parameter_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/"); - if(earResURL != null) { - jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2Stateless3Test.java index 412ec59a26..58f5d0b50d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2Stateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_parameter_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_query_parameter_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_query_parameter_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_query_parameter_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_query_parameter_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_query_parameter_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_query_parameter_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_query_parameter_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/"); - if(earResURL != null) { - jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/query/parameter/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_query_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientAppmanagedTest.java index 5f3e884082..28d4325804 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_annotations_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_annotations_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_annotations_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_annotations_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_annotations_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_annotations_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_annotations_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_annotations_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_annotations_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/annotations/"); - if(earResURL != null) { - jpa_core_relationship_annotations_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/annotations/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_annotations_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientAppmanagednotxTest.java index 8c0edc92bc..7e7580e434 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_annotations_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_annotations_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_annotations_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_annotations_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_annotations_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_annotations_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_annotations_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_annotations_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_annotations_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/annotations/"); - if(earResURL != null) { - jpa_core_relationship_annotations_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/annotations/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_annotations_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientPmservletTest.java index 7894b30f94..08263ded97 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_relationship_annotations_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_relationship_annotations = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_annotations.jar"); @@ -149,12 +150,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/annotations/"); - if(earResURL != null) { - jpa_core_relationship_annotations_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/annotations/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_annotations_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientPuservletTest.java index 002b624655..93bc88285b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_relationship_annotations_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_relationship_annotations = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_annotations.jar"); @@ -149,12 +150,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/annotations/"); - if(earResURL != null) { - jpa_core_relationship_annotations_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/annotations/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_annotations_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientStateful3Test.java index de14e2ab43..799950630f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_annotations_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_annotations_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_annotations_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_annotations_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_annotations_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_annotations_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_annotations_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_annotations_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_annotations_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/annotations/"); - if(earResURL != null) { - jpa_core_relationship_annotations_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/annotations/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_annotations_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientStateless3Test.java index 4e3a22e737..ac42aff94c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_annotations_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_annotations_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_annotations_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_annotations_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_annotations_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_annotations_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_annotations_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_annotations_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_annotations_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/annotations/"); - if(earResURL != null) { - jpa_core_relationship_annotations_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/annotations/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_annotations_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientAppmanagedTest.java index f512e285c1..7709f7d51c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidirmanyxmany_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_bidirmanyxmany_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxmany_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidirmanyxmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidirmanyxmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidirmanyxmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidirmanyxmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_bidirmanyxmany_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_bidirmanyxmany_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxmany/"); - if(earResURL != null) { - jpa_core_relationship_bidirmanyxmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidirmanyxmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientAppmanagednotxTest.java index faa0c81796..5683227205 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidirmanyxmany_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_bidirmanyxmany_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxmany_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidirmanyxmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidirmanyxmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidirmanyxmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidirmanyxmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_bidirmanyxmany_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_bidirmanyxmany_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxmany/"); - if(earResURL != null) { - jpa_core_relationship_bidirmanyxmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidirmanyxmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientPmservletTest.java index a5946d7f24..55e6454f66 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_relationship_bidirmanyxmany_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_relationship_bidirmanyxmany = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxmany.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxmany/"); - if(earResURL != null) { - jpa_core_relationship_bidirmanyxmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidirmanyxmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientPuservletTest.java index b2e9e1d2ff..603d72b89f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_relationship_bidirmanyxmany_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_relationship_bidirmanyxmany = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxmany.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxmany/"); - if(earResURL != null) { - jpa_core_relationship_bidirmanyxmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidirmanyxmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientStateful3Test.java index 266e61d6d0..085ccea05c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidirmanyxmany_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_bidirmanyxmany_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxmany_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidirmanyxmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidirmanyxmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidirmanyxmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidirmanyxmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_bidirmanyxmany_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_bidirmanyxmany_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxmany/"); - if(earResURL != null) { - jpa_core_relationship_bidirmanyxmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidirmanyxmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientStateless3Test.java index afc1414a1a..84d7e7421b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidirmanyxmany_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_bidirmanyxmany_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxmany_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidirmanyxmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidirmanyxmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidirmanyxmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidirmanyxmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_bidirmanyxmany_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_bidirmanyxmany_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxmany/"); - if(earResURL != null) { - jpa_core_relationship_bidirmanyxmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidirmanyxmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientAppmanagedTest.java index 83010e6413..6c1ca62bb8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidirmanyxone_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_bidirmanyxone_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxone_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidirmanyxone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidirmanyxone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidirmanyxone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidirmanyxone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_bidirmanyxone_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_bidirmanyxone_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxone/"); - if(earResURL != null) { - jpa_core_relationship_bidirmanyxone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidirmanyxone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientAppmanagednotxTest.java index 7ac31de8f0..9f2ab52297 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidirmanyxone_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_bidirmanyxone_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxone_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidirmanyxone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidirmanyxone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidirmanyxone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidirmanyxone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_bidirmanyxone_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_bidirmanyxone_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxone/"); - if(earResURL != null) { - jpa_core_relationship_bidirmanyxone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidirmanyxone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientPmservletTest.java index ef99ec54e7..a22f7c9f3f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_relationship_bidirmanyxone_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_relationship_bidirmanyxone = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxone.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxone/"); - if(earResURL != null) { - jpa_core_relationship_bidirmanyxone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidirmanyxone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientPuservletTest.java index 33f6c6b1b9..3fda151b09 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_relationship_bidirmanyxone_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_relationship_bidirmanyxone = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxone.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxone/"); - if(earResURL != null) { - jpa_core_relationship_bidirmanyxone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidirmanyxone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientStateful3Test.java index 26d1d7ceff..83a49a8937 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidirmanyxone_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_bidirmanyxone_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxone_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidirmanyxone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidirmanyxone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidirmanyxone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidirmanyxone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_bidirmanyxone_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_bidirmanyxone_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxone/"); - if(earResURL != null) { - jpa_core_relationship_bidirmanyxone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidirmanyxone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientStateless3Test.java index a97fc22770..3a0032f5de 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidirmanyxone_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_bidirmanyxone_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxone_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidirmanyxone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidirmanyxone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidirmanyxone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidirmanyxone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_bidirmanyxone_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_bidirmanyxone_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxone/"); - if(earResURL != null) { - jpa_core_relationship_bidirmanyxone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidirmanyxone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidirmanyxone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientAppmanagedTest.java index e2604109eb..82f8843065 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidironexmany_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_bidironexmany_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexmany_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidironexmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidironexmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidironexmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidironexmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_bidironexmany_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_bidironexmany_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexmany/"); - if(earResURL != null) { - jpa_core_relationship_bidironexmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidironexmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientAppmanagednotxTest.java index 979fc45ace..e7b4869dd9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidironexmany_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_bidironexmany_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexmany_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidironexmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidironexmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidironexmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidironexmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_bidironexmany_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_bidironexmany_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexmany/"); - if(earResURL != null) { - jpa_core_relationship_bidironexmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidironexmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientPmservletTest.java index 3d28d32821..49bb5a1523 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_relationship_bidironexmany_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_relationship_bidironexmany = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexmany.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexmany/"); - if(earResURL != null) { - jpa_core_relationship_bidironexmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidironexmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientPuservletTest.java index f8f4041d82..74566eb2d8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_relationship_bidironexmany_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_relationship_bidironexmany = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexmany.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexmany/"); - if(earResURL != null) { - jpa_core_relationship_bidironexmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidironexmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientStateful3Test.java index 692acc3e3d..015f5fcbb4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidironexmany_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_bidironexmany_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexmany_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidironexmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidironexmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidironexmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidironexmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_bidironexmany_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_bidironexmany_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexmany/"); - if(earResURL != null) { - jpa_core_relationship_bidironexmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidironexmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientStateless3Test.java index 2178fadc52..66b624188e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidironexmany_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_bidironexmany_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexmany_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidironexmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidironexmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidironexmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidironexmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_bidironexmany_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_bidironexmany_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexmany/"); - if(earResURL != null) { - jpa_core_relationship_bidironexmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidironexmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientAppmanagedTest.java index c6dcb173f4..a2a82db472 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidironexone_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_bidironexone_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexone_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidironexone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidironexone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidironexone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidironexone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_bidironexone_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_bidironexone_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexone/"); - if(earResURL != null) { - jpa_core_relationship_bidironexone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidironexone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientAppmanagednotxTest.java index b85e73977e..09ee73273e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidironexone_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_bidironexone_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexone_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidironexone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidironexone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidironexone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidironexone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_bidironexone_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_bidironexone_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexone/"); - if(earResURL != null) { - jpa_core_relationship_bidironexone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidironexone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientPmservletTest.java index 605aa9749e..f19e672a6c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_relationship_bidironexone_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_relationship_bidironexone = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexone.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexone/"); - if(earResURL != null) { - jpa_core_relationship_bidironexone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidironexone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientPuservletTest.java index a4d674fa18..b37694149a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_relationship_bidironexone_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_relationship_bidironexone = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexone.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexone/"); - if(earResURL != null) { - jpa_core_relationship_bidironexone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidironexone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientStateful3Test.java index bebd496909..5e1498f043 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidironexone_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_bidironexone_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexone_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidironexone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidironexone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidironexone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidironexone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_bidironexone_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_bidironexone_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexone/"); - if(earResURL != null) { - jpa_core_relationship_bidironexone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidironexone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientStateless3Test.java index 445b359508..588f990c86 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidironexone_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_bidironexone_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexone_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidironexone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidironexone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_bidironexone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_bidironexone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_bidironexone_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_bidironexone_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexone/"); - if(earResURL != null) { - jpa_core_relationship_bidironexone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/bidironexone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_bidironexone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientAppmanagedTest.java index 7186322122..0cd81d8683 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_defaults_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_defaults_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_defaults_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_defaults_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_defaults_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_defaults_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_defaults_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_defaults_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_defaults_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/defaults/"); - if(earResURL != null) { - jpa_core_relationship_defaults_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/defaults/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_defaults_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientAppmanagednotxTest.java index 94f88552b8..1130b6a2c1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_defaults_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_defaults_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_defaults_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_defaults_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_defaults_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_defaults_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_defaults_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_defaults_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_defaults_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/defaults/"); - if(earResURL != null) { - jpa_core_relationship_defaults_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/defaults/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_defaults_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientPmservletTest.java index b89d869af4..96d993787d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_relationship_defaults_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_relationship_defaults = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_defaults.jar"); @@ -149,12 +150,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/defaults/"); - if(earResURL != null) { - jpa_core_relationship_defaults_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/defaults/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_defaults_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientPuservletTest.java index bc9829ed75..6f59e0e075 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_relationship_defaults_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_relationship_defaults = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_defaults.jar"); @@ -149,12 +150,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/defaults/"); - if(earResURL != null) { - jpa_core_relationship_defaults_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/defaults/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_defaults_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientStateful3Test.java index 3060afdac1..d0ea3e360c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_defaults_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_defaults_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_defaults_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_defaults_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_defaults_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_defaults_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_defaults_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_defaults_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_defaults_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/defaults/"); - if(earResURL != null) { - jpa_core_relationship_defaults_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/defaults/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_defaults_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientStateless3Test.java index 5b6c4e0810..1e670d5f0d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_defaults_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_defaults_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_defaults_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_defaults_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_defaults_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_defaults_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_defaults_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_defaults_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_defaults_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/defaults/"); - if(earResURL != null) { - jpa_core_relationship_defaults_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/defaults/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_defaults_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientAppmanagedTest.java index 4c877ff5a2..7e1a3431d1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_descriptors_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_descriptors_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_descriptors_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_descriptors_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_descriptors_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_descriptors_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_descriptors_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_descriptors_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_descriptors_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/descriptors/"); - if(earResURL != null) { - jpa_core_relationship_descriptors_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/descriptors/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_descriptors_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientAppmanagednotxTest.java index 9dc42ce855..7d65ea07f1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_descriptors_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_descriptors_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_descriptors_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_descriptors_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_descriptors_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_descriptors_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_descriptors_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_descriptors_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_descriptors_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/descriptors/"); - if(earResURL != null) { - jpa_core_relationship_descriptors_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/descriptors/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_descriptors_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientPmservletTest.java index e482540931..137d7c2192 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_relationship_descriptors_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_relationship_descriptors = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_descriptors.jar"); @@ -149,12 +150,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/descriptors/"); - if(earResURL != null) { - jpa_core_relationship_descriptors_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/descriptors/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_descriptors_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientPuservletTest.java index 7a2ad3563e..bfae02de42 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_relationship_descriptors_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_relationship_descriptors = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_descriptors.jar"); @@ -149,12 +150,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/descriptors/"); - if(earResURL != null) { - jpa_core_relationship_descriptors_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/descriptors/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_descriptors_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientStateful3Test.java index c3036d1282..97ff412c02 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_descriptors_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_descriptors_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_descriptors_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_descriptors_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_descriptors_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_descriptors_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_descriptors_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_descriptors_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_descriptors_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/descriptors/"); - if(earResURL != null) { - jpa_core_relationship_descriptors_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/descriptors/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_descriptors_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientStateless3Test.java index 4c155cfd8f..e2ae4f7fc4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_descriptors_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_descriptors_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_descriptors_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_descriptors_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_descriptors_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_descriptors_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_descriptors_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_descriptors_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_descriptors_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -176,12 +177,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/descriptors/"); - if(earResURL != null) { - jpa_core_relationship_descriptors_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/descriptors/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_descriptors_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientAppmanagedTest.java index 3ab2d4378b..6e5bd0b4a0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unimanyxmany_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_unimanyxmany_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxmany_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unimanyxmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unimanyxmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unimanyxmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unimanyxmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_unimanyxmany_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_unimanyxmany_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxmany/"); - if(earResURL != null) { - jpa_core_relationship_unimanyxmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unimanyxmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientAppmanagednotxTest.java index d23056f43a..92197b983b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unimanyxmany_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_unimanyxmany_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxmany_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unimanyxmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unimanyxmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unimanyxmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unimanyxmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_unimanyxmany_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_unimanyxmany_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxmany/"); - if(earResURL != null) { - jpa_core_relationship_unimanyxmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unimanyxmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientPmservletTest.java index 9127e3bd5d..ab4e450a1c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_relationship_unimanyxmany_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_relationship_unimanyxmany = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxmany.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxmany/"); - if(earResURL != null) { - jpa_core_relationship_unimanyxmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unimanyxmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientPuservletTest.java index f5138d0831..0f0551abe2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_relationship_unimanyxmany_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_relationship_unimanyxmany = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxmany.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxmany/"); - if(earResURL != null) { - jpa_core_relationship_unimanyxmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unimanyxmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientStateful3Test.java index 88c44db271..1ab107bb9b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unimanyxmany_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_unimanyxmany_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxmany_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unimanyxmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unimanyxmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unimanyxmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unimanyxmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_unimanyxmany_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_unimanyxmany_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxmany/"); - if(earResURL != null) { - jpa_core_relationship_unimanyxmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unimanyxmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientStateless3Test.java index 15e58c0e6b..4ed35bdb76 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unimanyxmany_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_unimanyxmany_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxmany_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unimanyxmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unimanyxmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unimanyxmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unimanyxmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_unimanyxmany_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_unimanyxmany_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxmany/"); - if(earResURL != null) { - jpa_core_relationship_unimanyxmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unimanyxmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientAppmanagedTest.java index eb328c71a9..a7164b1825 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unimanyxone_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_unimanyxone_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxone_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unimanyxone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unimanyxone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unimanyxone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unimanyxone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_unimanyxone_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_unimanyxone_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxone/"); - if(earResURL != null) { - jpa_core_relationship_unimanyxone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unimanyxone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientAppmanagednotxTest.java index c10371a9f0..a0beeaa517 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unimanyxone_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_unimanyxone_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxone_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unimanyxone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unimanyxone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unimanyxone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unimanyxone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_unimanyxone_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_unimanyxone_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxone/"); - if(earResURL != null) { - jpa_core_relationship_unimanyxone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unimanyxone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientPmservletTest.java index 250eca3f59..d6d922fe65 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_relationship_unimanyxone_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_relationship_unimanyxone = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxone.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxone/"); - if(earResURL != null) { - jpa_core_relationship_unimanyxone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unimanyxone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientPuservletTest.java index d7c8592a4f..45e54ed901 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_relationship_unimanyxone_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_relationship_unimanyxone = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxone.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxone/"); - if(earResURL != null) { - jpa_core_relationship_unimanyxone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unimanyxone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientStateful3Test.java index 8e5f8f22e8..f99277b4e7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unimanyxone_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_unimanyxone_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxone_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unimanyxone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unimanyxone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unimanyxone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unimanyxone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_unimanyxone_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_unimanyxone_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxone/"); - if(earResURL != null) { - jpa_core_relationship_unimanyxone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unimanyxone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientStateless3Test.java index 86d8b50710..b027b3685f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unimanyxone_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_unimanyxone_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxone_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unimanyxone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unimanyxone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unimanyxone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unimanyxone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_unimanyxone_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_unimanyxone_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxone/"); - if(earResURL != null) { - jpa_core_relationship_unimanyxone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unimanyxone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unimanyxone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientAppmanagedTest.java index 8b66dffadd..ba2d4b48bc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unionexmany_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_unionexmany_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexmany_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.relationship.unionexmany.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unionexmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unionexmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unionexmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unionexmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_unionexmany_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_unionexmany_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexmany/"); - if(earResURL != null) { - jpa_core_relationship_unionexmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unionexmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientAppmanagednotxTest.java index 4dbc214b4b..af26b6cac1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unionexmany_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_unionexmany_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexmany_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.relationship.unionexmany.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unionexmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unionexmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unionexmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unionexmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_unionexmany_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_unionexmany_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexmany/"); - if(earResURL != null) { - jpa_core_relationship_unionexmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unionexmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientPmservletTest.java index af748dae6a..afb19e18e1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_relationship_unionexmany_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_relationship_unionexmany = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexmany.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexmany/"); - if(earResURL != null) { - jpa_core_relationship_unionexmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unionexmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientPuservletTest.java index d631fb7e6e..2cf935f9bd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_relationship_unionexmany_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_relationship_unionexmany = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexmany.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexmany/"); - if(earResURL != null) { - jpa_core_relationship_unionexmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unionexmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientStateful3Test.java index dcf1f8da41..82e90d60c8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unionexmany_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_unionexmany_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexmany_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.relationship.unionexmany.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unionexmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unionexmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unionexmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unionexmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_unionexmany_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_unionexmany_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexmany/"); - if(earResURL != null) { - jpa_core_relationship_unionexmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unionexmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientStateless3Test.java index eaef28d359..563373f122 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unionexmany_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_unionexmany_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexmany_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.relationship.unionexmany.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unionexmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unionexmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unionexmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unionexmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_unionexmany_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_unionexmany_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexmany/"); - if(earResURL != null) { - jpa_core_relationship_unionexmany_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexmany/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unionexmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientAppmanagedTest.java index 7beef4e6a4..f6672efefb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unionexone_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_unionexone_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexone_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unionexone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unionexone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unionexone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unionexone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_unionexone_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_unionexone_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexone/"); - if(earResURL != null) { - jpa_core_relationship_unionexone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unionexone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientAppmanagednotxTest.java index 9dcbce2d80..0bbce60cfc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unionexone_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_unionexone_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexone_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unionexone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unionexone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unionexone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unionexone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_unionexone_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_unionexone_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexone/"); - if(earResURL != null) { - jpa_core_relationship_unionexone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unionexone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientPmservletTest.java index 3b1502db06..f90bf354b6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_relationship_unionexone_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_relationship_unionexone = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexone.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexone/"); - if(earResURL != null) { - jpa_core_relationship_unionexone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unionexone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientPuservletTest.java index f358410697..fe20c0919f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_relationship_unionexone_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_relationship_unionexone = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexone.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexone/"); - if(earResURL != null) { - jpa_core_relationship_unionexone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unionexone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientStateful3Test.java index ea24d7c4c5..c7659e2a71 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unionexone_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_unionexone_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexone_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unionexone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unionexone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unionexone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unionexone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_unionexone_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_unionexone_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexone/"); - if(earResURL != null) { - jpa_core_relationship_unionexone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unionexone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientStateless3Test.java index fd862316d6..74c4bbbc79 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unionexone_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_relationship_unionexone_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexone_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unionexone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unionexone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_relationship_unionexone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_relationship_unionexone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_relationship_unionexone_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_relationship_unionexone_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexone/"); - if(earResURL != null) { - jpa_core_relationship_unionexone_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/relationship/unionexone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_relationship_unionexone_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientAppmanagedTest.java index 89e03151fa..79b9c01374 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_auto_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_auto_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_auto_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_auto_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_auto_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_auto_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_auto_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_auto_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_auto_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/auto/"); - if(earResURL != null) { - jpa_core_types_auto_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/auto/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_auto_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientAppmanagednotxTest.java index 00c18dccd6..497e72faec 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_auto_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_auto_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_auto_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_auto_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_auto_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_auto_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_auto_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_auto_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_auto_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/auto/"); - if(earResURL != null) { - jpa_core_types_auto_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/auto/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_auto_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientPmservletTest.java index 94f990b66c..e345f9afd3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_types_auto_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_types_auto = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_auto.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/auto/"); - if(earResURL != null) { - jpa_core_types_auto_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/auto/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_auto_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientPuservletTest.java index e749a54488..02b0540f89 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_types_auto_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_types_auto = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_auto.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/auto/"); - if(earResURL != null) { - jpa_core_types_auto_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/auto/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_auto_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientStateful3Test.java index a89920590b..def34c77f0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_auto_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_auto_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_auto_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_auto_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_auto_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_auto_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_auto_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_auto_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_auto_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/auto/"); - if(earResURL != null) { - jpa_core_types_auto_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/auto/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_auto_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientStateless3Test.java index 2876ef34ac..8e3fa103cb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_auto_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_auto_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_auto_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_auto_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_auto_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_auto_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_auto_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_auto_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_auto_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/auto/"); - if(earResURL != null) { - jpa_core_types_auto_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/auto/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_auto_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientAppmanagedTest.java index cf17b24a7f..563b45f25b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_field_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_field_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_field_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_field_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_field_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_field_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_field_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_field_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_field_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/field/"); - if(earResURL != null) { - jpa_core_types_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/field/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientAppmanagednotxTest.java index 8d98871281..f3a8e1c8e2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_field_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_field_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_field_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_field_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_field_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_field_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_field_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_field_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_field_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/field/"); - if(earResURL != null) { - jpa_core_types_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/field/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientPmservletTest.java index 63c08a50bf..f13ab67d0b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_types_field_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_types_field = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_field.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/field/"); - if(earResURL != null) { - jpa_core_types_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/field/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientPuservletTest.java index dbb6697954..ff2283a9bd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_types_field_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_types_field = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_field.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/field/"); - if(earResURL != null) { - jpa_core_types_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/field/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientStateful3Test.java index 8e8c244d67..aa54e6d9bc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_field_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_field_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_field_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_field_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_field_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_field_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_field_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_field_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_field_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/field/"); - if(earResURL != null) { - jpa_core_types_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/field/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientStateless3Test.java index e08dcc3d24..494c7369ea 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_field_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_field_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_field_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_field_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_field_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_field_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_field_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_field_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_field_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/field/"); - if(earResURL != null) { - jpa_core_types_field_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/field/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1AppmanagedTest.java index 372b9c69d0..33e8a732b5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1AppmanagedTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_generator_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_generator_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_generator_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1AppmanagednotxTest.java index e74abd2d83..5a18c5b0dd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1AppmanagednotxTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_generator_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_generator_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_generator_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1PmservletTest.java index f2df1e9358..a190dce14d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The web.xml descriptor URL warResURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_types_generator_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_types_generator = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator.jar"); @@ -146,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1PuservletTest.java index 54fd2a08dc..84699c76c7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The web.xml descriptor URL warResURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_types_generator_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_types_generator = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator.jar"); @@ -146,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1Stateful3Test.java index 1f6ff50acc..049d4d650e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1Stateful3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_generator_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_generator_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_generator_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1Stateless3Test.java index 040ad7268c..216a91a805 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1Stateless3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_generator_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_generator_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_generator_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2AppmanagedTest.java index befca7d917..a31ce5bc73 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2AppmanagedTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_generator_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_generator_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_generator_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2AppmanagednotxTest.java index e529e6ed44..74fdf2b69e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2AppmanagednotxTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_generator_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_generator_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_generator_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2PmservletTest.java index 8a803567d6..dbc3a9c5d2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The web.xml descriptor URL warResURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_types_generator_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_types_generator = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator.jar"); @@ -146,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2PuservletTest.java index c81ca74c99..f8f7b0d5ae 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The web.xml descriptor URL warResURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_types_generator_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_types_generator = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator.jar"); @@ -146,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2Stateful3Test.java index 0038683890..9043ce8281 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2Stateful3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_generator_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_generator_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_generator_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2Stateless3Test.java index 009a14f429..ed3cc1c6b1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2Stateless3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_generator_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_generator_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_generator_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3AppmanagedTest.java index 8acc96b5af..78ae2ae030 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3AppmanagedTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The application-client.xml descriptor URL resURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_appmanaged_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_generator_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_generator_appmanaged_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_generator_appmanaged_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3AppmanagednotxTest.java index b3188db9e9..eb35f3555d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3AppmanagednotxTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The application-client.xml descriptor URL resURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_appmanagedNoTx_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_generator_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_generator_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_generator_appmanagedNoTx_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3PmservletTest.java index bba24cf740..82e98d35af 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The web.xml descriptor URL warResURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_types_generator_pmservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_types_generator = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator.jar"); @@ -146,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3PuservletTest.java index 2ad9902a06..c3fb6d60a7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The web.xml descriptor URL warResURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_types_generator_puservlet_vehicle_web, Client3.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_types_generator = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator.jar"); @@ -146,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3Stateful3Test.java index 92b890cd5b..c69e90a03a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3Stateful3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The application-client.xml descriptor URL resURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_stateful3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_generator_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_generator_stateful3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_generator_stateful3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3Stateless3Test.java index 6cfd269e8f..308f64fd4e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3Stateless3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The application-client.xml descriptor URL resURL = Client3.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_stateless3_vehicle_client, Client3.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_generator_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client3.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_generator_stateless3_vehicle_ejb, Client3.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_generator_stateless3_vehicle_ejb, Client3.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client3.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4AppmanagedTest.java index d673ecdf67..1d2273e9a7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4AppmanagedTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The application-client.xml descriptor URL resURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_appmanaged_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_generator_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_appmanaged_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_generator_appmanaged_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_generator_appmanaged_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4AppmanagednotxTest.java index 7bfd323652..be83f58249 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4AppmanagednotxTest.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The application-client.xml descriptor URL resURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_appmanagedNoTx_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_generator_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, - com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class + com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_generator_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_generator_appmanagedNoTx_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4PmservletTest.java index a7078b9359..2ed6294778 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4PmservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The web.xml descriptor URL warResURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_types_generator_pmservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_types_generator = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator.jar"); @@ -146,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4PuservletTest.java index c8d955d156..f28cc43755 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4PuservletTest.java @@ -82,7 +82,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The web.xml descriptor URL warResURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); @@ -110,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_types_generator_puservlet_vehicle_web, Client4.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_types_generator = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator.jar"); @@ -146,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4Stateful3Test.java index fb2e7850c8..989e08f224 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4Stateful3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The application-client.xml descriptor URL resURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_stateful3_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_generator_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_stateful3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_generator_stateful3_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_generator_stateful3_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4Stateless3Test.java index 6e9f90273f..baef243b4b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4Stateless3Test.java @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The application-client.xml descriptor URL resURL = Client4.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_stateless3_vehicle_client, Client4.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_generator_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_stateless3_vehicle_ejb.jar"); // The class files @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, - com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class + com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, + ee.jakarta.tck.persistence.core.types.generator.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_generator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client4.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_generator_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_generator_stateless3_vehicle_ejb, Client4.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_generator_stateless3_vehicle_ejb, Client4.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/"); - if(earResURL != null) { - jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/com/sun/ts/tests/jpa/core/types/generator/.ear.sun-application.xml"); + earResURL = Client4.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_generator_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientAppmanagedTest.java index 639dfa5001..09b7b85b2e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_pkey_compound_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_pkey_compound_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_pkey_compound_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_pkey_compound_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_pkey_compound_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_pkey_compound_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_pkey_compound_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_pkey_compound_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_pkey_compound_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/primarykey/compound/"); - if(earResURL != null) { - jpa_core_types_pkey_compound_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/primarykey/compound/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_pkey_compound_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientAppmanagednotxTest.java index d528d3b040..17051dacfa 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_pkey_compound_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_pkey_compound_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_pkey_compound_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_pkey_compound_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_pkey_compound_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_pkey_compound_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_pkey_compound_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_pkey_compound_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_pkey_compound_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/primarykey/compound/"); - if(earResURL != null) { - jpa_core_types_pkey_compound_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/primarykey/compound/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_pkey_compound_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientPmservletTest.java index 75dcb6ec02..c8a2b12a7b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_types_pkey_compound_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_types_pkey_compound = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_pkey_compound.jar"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/primarykey/compound/"); - if(earResURL != null) { - jpa_core_types_pkey_compound_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/primarykey/compound/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_pkey_compound_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientPuservletTest.java index b6924b68c1..df1176eef6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_types_pkey_compound_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_types_pkey_compound = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_pkey_compound.jar"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/primarykey/compound/"); - if(earResURL != null) { - jpa_core_types_pkey_compound_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/primarykey/compound/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_pkey_compound_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientStateful3Test.java index ee5c321f61..b6e5e85f80 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_pkey_compound_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_pkey_compound_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_pkey_compound_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_pkey_compound_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_pkey_compound_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_pkey_compound_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_pkey_compound_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_pkey_compound_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_pkey_compound_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/primarykey/compound/"); - if(earResURL != null) { - jpa_core_types_pkey_compound_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/primarykey/compound/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_pkey_compound_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientStateless3Test.java index 912f95f929..f8d0478986 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_pkey_compound_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_pkey_compound_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_pkey_compound_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_pkey_compound_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_pkey_compound_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_pkey_compound_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_pkey_compound_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_pkey_compound_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_pkey_compound_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/primarykey/compound/"); - if(earResURL != null) { - jpa_core_types_pkey_compound_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/types/primarykey/compound/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_pkey_compound_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1AppmanagedTest.java index 5290cedd9c..74d55476e2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1AppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_property_appmanaged_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_property_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_property_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_property_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_property_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_property_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_property_appmanaged_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_property_appmanaged_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/property/"); - if(earResURL != null) { - jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/property/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1AppmanagednotxTest.java index d91d887562..058ada22c0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1AppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_property_appmanagedNoTx_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_property_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_property_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_property_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_property_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_property_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_property_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_property_appmanagedNoTx_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/property/"); - if(earResURL != null) { - jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/property/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1PmservletTest.java index 7c8aaae501..5513a2ceff 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1PmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_types_property_pmservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_types_property = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/property/"); - if(earResURL != null) { - jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/property/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1PuservletTest.java index ca7076f688..ee3b8265cc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1PuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_types_property_puservlet_vehicle_web, Client1.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_types_property = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/property/"); - if(earResURL != null) { - jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/property/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1Stateful3Test.java index 177f1caeb3..fefebe6f28 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1Stateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_property_stateful3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_property_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_property_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_property_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_property_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_property_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_property_stateful3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_property_stateful3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/property/"); - if(earResURL != null) { - jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/property/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1Stateless3Test.java index 570d2b77df..d8883165ae 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1Stateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_property_stateless3_vehicle_client, Client1.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_property_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_property_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_property_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_property_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client1.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_property_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_property_stateless3_vehicle_ejb, Client1.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_property_stateless3_vehicle_ejb, Client1.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/property/"); - if(earResURL != null) { - jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/types/property/.ear.sun-application.xml"); + earResURL = Client1.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2AppmanagedTest.java index 72b5dfaf47..1fa3dc3246 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2AppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_property_appmanaged_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_property_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_property_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_property_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_property_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_property_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_property_appmanaged_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_property_appmanaged_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/property/"); - if(earResURL != null) { - jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/property/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2AppmanagednotxTest.java index b47fc8ebed..da5c018174 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2AppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_property_appmanagedNoTx_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_property_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_property_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_property_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_property_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_property_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_property_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_property_appmanagedNoTx_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/property/"); - if(earResURL != null) { - jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/property/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2PmservletTest.java index b071fcd70b..431afa1f26 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2PmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_types_property_pmservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_types_property = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/property/"); - if(earResURL != null) { - jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/property/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2PuservletTest.java index 4a96b12dc1..4a09f075f9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2PuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_types_property_puservlet_vehicle_web, Client2.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_types_property = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/property/"); - if(earResURL != null) { - jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/property/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2Stateful3Test.java index 7e36ffb219..01325e23df 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2Stateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_property_stateful3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_property_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_property_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_property_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_property_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_property_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_property_stateful3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_property_stateful3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/property/"); - if(earResURL != null) { - jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/property/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2Stateless3Test.java index 9c2049f2cd..b746da0c71 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2Stateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_property_stateless3_vehicle_client, Client2.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_types_property_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_types_property_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_types_property_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_types_property_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_types_property_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_types_property_stateless3_vehicle_ejb, Client2.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_types_property_stateless3_vehicle_ejb, Client2.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/property/"); - if(earResURL != null) { - jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/com/sun/ts/tests/jpa/core/types/property/.ear.sun-application.xml"); + earResURL = Client2.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_types_property_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientAppmanagedTest.java index a51aef169c..a61e6d0c47 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_versioning_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_versioning_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_versioning_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_versioning_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_versioning_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_versioning_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_versioning_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_versioning_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_versioning_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/versioning/"); - if(earResURL != null) { - jpa_core_versioning_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/versioning/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_versioning_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientAppmanagednotxTest.java index 2f7af5ec2c..5db05e35b9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_versioning_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_versioning_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_versioning_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_versioning_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_versioning_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_versioning_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_versioning_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_versioning_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_versioning_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/versioning/"); - if(earResURL != null) { - jpa_core_versioning_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/versioning/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_versioning_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientPmservletTest.java index 77292016fb..e9a53c66f5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_versioning_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_versioning = ShrinkWrap.create(JavaArchive.class, "jpa_core_versioning.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/versioning/"); - if(earResURL != null) { - jpa_core_versioning_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/versioning/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_versioning_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientPuservletTest.java index 410e271a16..4184747c06 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_versioning_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_versioning = ShrinkWrap.create(JavaArchive.class, "jpa_core_versioning.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/versioning/"); - if(earResURL != null) { - jpa_core_versioning_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/versioning/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_versioning_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientStateful3Test.java index d88b9af502..a94a12ef4d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_versioning_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_versioning_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_versioning_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_versioning_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_versioning_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_versioning_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_versioning_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_versioning_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_versioning_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/versioning/"); - if(earResURL != null) { - jpa_core_versioning_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/versioning/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_versioning_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientStateless3Test.java index eb04b793f2..ae261919a5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_versioning_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_versioning_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_versioning_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_versioning_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_versioning_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_versioning_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_versioning_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_versioning_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_versioning_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/versioning/"); - if(earResURL != null) { - jpa_core_versioning_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/versioning/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_versioning_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientAppmanagedTest.java index d845f726ea..bb5b81c626 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientAppmanagedTest.java @@ -108,7 +108,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_entityManager_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_ee_entityManager_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager_appmanaged_vehicle_ejb.jar"); // The class files @@ -133,17 +133,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_ee_entityManager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_ee_entityManager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_ee_entityManager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_ee_entityManager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_ee_entityManager_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_ee_entityManager_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -179,12 +180,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/entityManager/"); - if(earResURL != null) { - jpa_ee_entityManager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/entityManager/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_ee_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientPmservletTest.java index 0e79423fd1..962521b182 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientPmservletTest.java @@ -119,6 +119,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_ee_entityManager_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_ee_entityManager = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager.jar"); @@ -152,12 +153,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/entityManager/"); - if(earResURL != null) { - jpa_ee_entityManager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/entityManager/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_ee_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientStateful3Test.java index 3732e6fb6b..a69a55988c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientStateful3Test.java @@ -108,7 +108,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_entityManager_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_ee_entityManager_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager_stateful3_vehicle_ejb.jar"); // The class files @@ -133,17 +133,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_ee_entityManager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_ee_entityManager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_ee_entityManager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_ee_entityManager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_ee_entityManager_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_ee_entityManager_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -179,12 +180,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/entityManager/"); - if(earResURL != null) { - jpa_ee_entityManager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/entityManager/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_ee_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientStateless3Test.java index a58d434c5c..701dfbdc8c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientStateless3Test.java @@ -108,7 +108,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_entityManager_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_ee_entityManager_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager_stateless3_vehicle_ejb.jar"); // The class files @@ -133,17 +133,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_ee_entityManager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_ee_entityManager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_ee_entityManager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_ee_entityManager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_ee_entityManager_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_ee_entityManager_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -179,12 +180,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/entityManager/"); - if(earResURL != null) { - jpa_ee_entityManager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/entityManager/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_ee_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientAppmanagedTest.java index d404b38a13..c650dae630 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_entityManagerFactory_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/entityManagerFactory/"); - if(earResURL != null) { - jpa_ee_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/entityManagerFactory/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_ee_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientPmservletTest.java index 2dc4823db3..46af98539a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_ee_entityManagerFactory_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_ee_entityManagerFactory = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/entityManagerFactory/"); - if(earResURL != null) { - jpa_ee_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/entityManagerFactory/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_ee_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientStateful3Test.java index 6e88584d67..bd5427f52f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_entityManagerFactory_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_ee_entityManagerFactory_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_ee_entityManagerFactory_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_ee_entityManagerFactory_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_ee_entityManagerFactory_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_ee_entityManagerFactory_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_ee_entityManagerFactory_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_ee_entityManagerFactory_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/entityManagerFactory/"); - if(earResURL != null) { - jpa_ee_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/entityManagerFactory/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_ee_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientStateless3Test.java index 3676fe8e98..c0d1a0a6de 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_entityManagerFactory_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_ee_entityManagerFactory_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_ee_entityManagerFactory_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_ee_entityManagerFactory_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_ee_entityManagerFactory_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_ee_entityManagerFactory_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_ee_entityManagerFactory_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_ee_entityManagerFactory_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/entityManagerFactory/"); - if(earResURL != null) { - jpa_ee_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/entityManagerFactory/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_ee_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/annotation/ClientTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/annotation/ClientTest.java index b7c7c9cda0..6923155070 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/annotation/ClientTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/annotation/ClientTest.java @@ -57,12 +57,12 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive com.sun.ts.lib.harness.EETest.SetupException.class ); // The application-client.xml descriptor - URL resURL = Client.class.getResource("com/sun/ts/tests/jpa/ee/packaging/appclient/annotation/"); + URL resURL = Client.class.getResource(""); if(resURL != null) { jpa_ee_packaging_appclient_annotation_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/appclient/annotation/.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/.jar.sun-application-client.xml"); if(resURL != null) { jpa_ee_packaging_appclient_annotation_client.addAsManifestResource(resURL, "application-client.xml"); } @@ -70,6 +70,7 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_packaging_appclient_annotation_client, Client.class, resURL); + // Ear EnterpriseArchive jpa_ee_packaging_appclient_annotation_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_appclient_annotation.ear"); @@ -81,12 +82,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/appclient/annotation/"); - if(earResURL != null) { - jpa_ee_packaging_appclient_annotation_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/appclient/annotation/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_ee_packaging_appclient_annotation_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/descriptor/ClientTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/descriptor/ClientTest.java index e5d8a41682..7c4af6cf9c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/descriptor/ClientTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/descriptor/ClientTest.java @@ -71,6 +71,7 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_packaging_appclient_descriptor_client, Client.class, resURL); + // Ear EnterpriseArchive jpa_ee_packaging_appclient_descriptor_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_appclient_descriptor.ear"); @@ -82,12 +83,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/appclient/descriptor/"); - if(earResURL != null) { - jpa_ee_packaging_appclient_descriptor_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/appclient/descriptor/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_ee_packaging_appclient_descriptor_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/ClientTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/ClientTest.java index f5f36fedf3..c2c9e5b503 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/ClientTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/ClientTest.java @@ -77,7 +77,7 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_packaging_ejb_descriptor_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_ee_packaging_ejb_descriptor_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_ejb_descriptor_ejb.jar"); // The class files @@ -91,17 +91,18 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.Stateless3Bean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/descriptor/jpa_ee_packaging_ejb_descriptor_ejb.jar.xml"); - if(ejbResURL != null) { - jpa_ee_packaging_ejb_descriptor_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/descriptor/jpa_ee_packaging_ejb_descriptor_ejb.jar.xml"); + if(ejbResURL1 != null) { + jpa_ee_packaging_ejb_descriptor_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/descriptor/jpa_ee_packaging_ejb_descriptor_ejb.jar.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_ee_packaging_ejb_descriptor_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/descriptor/jpa_ee_packaging_ejb_descriptor_ejb.jar.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_ee_packaging_ejb_descriptor_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_ee_packaging_ejb_descriptor_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_ee_packaging_ejb_descriptor_ejb, Client.class, ejbResURL1); + // Ear EnterpriseArchive jpa_ee_packaging_ejb_descriptor_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_ejb_descriptor.ear"); @@ -115,12 +116,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/descriptor/"); - if(earResURL != null) { - jpa_ee_packaging_ejb_descriptor_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/descriptor/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_ee_packaging_ejb_descriptor_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/exclude/ClientTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/exclude/ClientTest.java index 451489b080..3512931211 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/exclude/ClientTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/exclude/ClientTest.java @@ -60,12 +60,12 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive com.sun.ts.lib.harness.EETest.SetupException.class ); // The application-client.xml descriptor - URL resURL = Client.class.getResource("com/sun/ts/tests/jpa/ee/packaging/ejb/exclude/"); + URL resURL = Client.class.getResource(""); if(resURL != null) { jpa_ee_packaging_ejb_exclude_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/exclude/.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/.jar.sun-application-client.xml"); if(resURL != null) { jpa_ee_packaging_ejb_exclude_client.addAsManifestResource(resURL, "application-client.xml"); } @@ -73,7 +73,7 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_packaging_ejb_exclude_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_ee_packaging_ejb_exclude_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_ejb_exclude_ejb.jar"); // The class files @@ -84,17 +84,18 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive ee.jakarta.tck.persistence.ee.packaging.ejb.exclude.B.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/exclude/"); - if(ejbResURL != null) { - jpa_ee_packaging_ejb_exclude_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("/"); + if(ejbResURL1 != null) { + jpa_ee_packaging_ejb_exclude_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/exclude/.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_ee_packaging_ejb_exclude_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_ee_packaging_ejb_exclude_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_ee_packaging_ejb_exclude_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_ee_packaging_ejb_exclude_ejb, Client.class, ejbResURL1); + // Ear EnterpriseArchive jpa_ee_packaging_ejb_exclude_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_ejb_exclude.ear"); @@ -108,12 +109,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/exclude/"); - if(earResURL != null) { - jpa_ee_packaging_ejb_exclude_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/exclude/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_ee_packaging_ejb_exclude_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/ClientTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/ClientTest.java index d8b4a4aa84..7021fffc90 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/ClientTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/ClientTest.java @@ -75,7 +75,7 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_packaging_ejb_resource_local_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_ee_packaging_ejb_resource_local_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_ejb_resource_local_ejb.jar"); // The class files @@ -86,17 +86,18 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive ee.jakarta.tck.persistence.ee.common.B.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/resource_local/jpa_ee_packaging_ejb_resource_local_ejb.jar.xml"); - if(ejbResURL != null) { - jpa_ee_packaging_ejb_resource_local_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/resource_local/jpa_ee_packaging_ejb_resource_local_ejb.jar.xml"); + if(ejbResURL1 != null) { + jpa_ee_packaging_ejb_resource_local_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/resource_local/jpa_ee_packaging_ejb_resource_local_ejb.jar.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_ee_packaging_ejb_resource_local_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/resource_local/jpa_ee_packaging_ejb_resource_local_ejb.jar.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_ee_packaging_ejb_resource_local_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_ee_packaging_ejb_resource_local_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_ee_packaging_ejb_resource_local_ejb, Client.class, ejbResURL1); + // Ear EnterpriseArchive jpa_ee_packaging_ejb_resource_local_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_ejb_resource_local.ear"); @@ -110,12 +111,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/resource_local/"); - if(earResURL != null) { - jpa_ee_packaging_ejb_resource_local_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/resource_local/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_ee_packaging_ejb_resource_local_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/ClientTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/ClientTest.java index 54ccd572a7..49e375fcd6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/ClientTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/ClientTest.java @@ -59,12 +59,12 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive com.sun.ts.lib.harness.EETest.SetupException.class ); // The application-client.xml descriptor - URL resURL = Client.class.getResource("com/sun/ts/tests/jpa/ee/packaging/ejb/standalone/"); + URL resURL = Client.class.getResource(""); if(resURL != null) { jpa_ee_packaging_ejb_standalone_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/standalone/.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/.jar.sun-application-client.xml"); if(resURL != null) { jpa_ee_packaging_ejb_standalone_client.addAsManifestResource(resURL, "application-client.xml"); } @@ -72,7 +72,7 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_packaging_ejb_standalone_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_ee_packaging_ejb_standalone_component_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_ejb_standalone_component_ejb.jar"); // The class files @@ -83,17 +83,18 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive ee.jakarta.tck.persistence.ee.common.B.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/standalone/jpa_ee_packaging_ejb_standalone_component_ejb.jar.xml"); - if(ejbResURL != null) { - jpa_ee_packaging_ejb_standalone_component_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/standalone/jpa_ee_packaging_ejb_standalone_component_ejb.jar.xml"); + if(ejbResURL1 != null) { + jpa_ee_packaging_ejb_standalone_component_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/standalone/jpa_ee_packaging_ejb_standalone_component_ejb.jar.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_ee_packaging_ejb_standalone_component_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/standalone/jpa_ee_packaging_ejb_standalone_component_ejb.jar.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_ee_packaging_ejb_standalone_component_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_ee_packaging_ejb_standalone_component_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_ee_packaging_ejb_standalone_component_ejb, Client.class, ejbResURL1); + // Ear EnterpriseArchive jpa_ee_packaging_ejb_standalone_ejb_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_ejb_standalone_ejb.ear"); @@ -107,12 +108,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/standalone/"); - if(earResURL != null) { - jpa_ee_packaging_ejb_standalone_ejb_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/ejb/standalone/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_ee_packaging_ejb_standalone_ejb_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/ClientTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/ClientTest.java index 1359d9cdc4..058171bf8c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/ClientTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/ClientTest.java @@ -86,6 +86,7 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // Call the archive processor archiveProcessor.processWebArchive(jpa_ee_packaging_web_scope_web, Client.class, warResURL); + // Ear EnterpriseArchive jpa_ee_packaging_web_scope_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_web_scope.ear"); @@ -97,7 +98,8 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/web/scope/application.xml"); + URL earResURL = null; + earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/web/scope/application.xml"); if(earResURL != null) { jpa_ee_packaging_web_scope_ear.addAsManifestResource(earResURL, "application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/ClientTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/ClientTest.java index d911935a3f..fa8c99be09 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/ClientTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/ClientTest.java @@ -83,6 +83,7 @@ public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchive // Call the archive processor archiveProcessor.processWebArchive(jpa_ee_packaging_web_standalone_component_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_ee_packaging_web_standalone = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_web_standalone.jar"); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/ClientTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/ClientTest.java index b090415412..4d43d1b0af 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/ClientTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/ClientTest.java @@ -62,12 +62,12 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive ee.jakarta.tck.persistence.ee.propagation.am.Client.class ); // The application-client.xml descriptor - URL resURL = Client.class.getResource("com/sun/ts/tests/jpa/ee/propagation/am/"); + URL resURL = Client.class.getResource(""); if(resURL != null) { jpa_ee_propagation_am_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/propagation/am/.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/.jar.sun-application-client.xml"); if(resURL != null) { jpa_ee_propagation_am_client.addAsManifestResource(resURL, "application-client.xml"); } @@ -75,7 +75,7 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_propagation_am_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_ee_propagation_am_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_ee_propagation_am_ejb.jar"); // The class files @@ -88,17 +88,18 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive ee.jakarta.tck.persistence.ee.propagation.am.Stateful3Bean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/propagation/am/"); - if(ejbResURL != null) { - jpa_ee_propagation_am_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("/"); + if(ejbResURL1 != null) { + jpa_ee_propagation_am_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/propagation/am/.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_ee_propagation_am_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_ee_propagation_am_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_ee_propagation_am_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_ee_propagation_am_ejb, Client.class, ejbResURL1); + // Ear EnterpriseArchive jpa_ee_propagation_am_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_propagation_am.ear"); @@ -112,12 +113,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/propagation/am/"); - if(earResURL != null) { - jpa_ee_propagation_am_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/propagation/am/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_ee_propagation_am_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/ClientTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/ClientTest.java index d606e40ff8..5ee5d95fe1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/ClientTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/ClientTest.java @@ -60,12 +60,12 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive com.sun.ts.lib.harness.EETest.SetupException.class ); // The application-client.xml descriptor - URL resURL = Client.class.getResource("com/sun/ts/tests/jpa/ee/propagation/cm/extended/"); + URL resURL = Client.class.getResource(""); if(resURL != null) { jpa_ee_propagation_cm_ext_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/propagation/cm/extended/.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/.jar.sun-application-client.xml"); if(resURL != null) { jpa_ee_propagation_cm_ext_client.addAsManifestResource(resURL, "application-client.xml"); } @@ -73,7 +73,7 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_propagation_cm_ext_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_ee_propagation_cm_ext_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_ee_propagation_cm_ext_ejb.jar"); // The class files @@ -84,17 +84,18 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive ee.jakarta.tck.persistence.ee.propagation.cm.extended.Stateful3Bean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/propagation/cm/extended/"); - if(ejbResURL != null) { - jpa_ee_propagation_cm_ext_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("/"); + if(ejbResURL1 != null) { + jpa_ee_propagation_cm_ext_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/propagation/cm/extended/.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_ee_propagation_cm_ext_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_ee_propagation_cm_ext_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_ee_propagation_cm_ext_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_ee_propagation_cm_ext_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -132,12 +133,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/propagation/cm/extended/"); - if(earResURL != null) { - jpa_ee_propagation_cm_ext_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/propagation/cm/extended/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_ee_propagation_cm_ext_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/ClientTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/ClientTest.java index fde0624619..cdd3c1db94 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/ClientTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/ClientTest.java @@ -92,7 +92,7 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // Call the archive processor archiveProcessor.processWebArchive(jpa_ee_propagation_cm_jta_web, Client.class, warResURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_ee_propagation_cm_jta_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_ee_propagation_cm_jta_ejb.jar"); // The class files @@ -102,17 +102,18 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive ee.jakarta.tck.persistence.ee.propagation.cm.jta.TellerBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/propagation/cm/jta/"); - if(ejbResURL != null) { - jpa_ee_propagation_cm_jta_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("/"); + if(ejbResURL1 != null) { + jpa_ee_propagation_cm_jta_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/propagation/cm/jta/.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_ee_propagation_cm_jta_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_ee_propagation_cm_jta_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_ee_propagation_cm_jta_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_ee_propagation_cm_jta_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -151,7 +152,8 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/propagation/cm/jta/application.xml"); + URL earResURL = null; + earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/propagation/cm/jta/application.xml"); if(earResURL != null) { jpa_ee_propagation_cm_jta_ear.addAsManifestResource(earResURL, "application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientAppmanagedTest.java index 69b0ec7cb3..bd79bd9190 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXmanyFetchEager_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_oneXmanyFetchEager_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmanyFetchEager_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXmanyFetchEager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXmanyFetchEager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXmanyFetchEager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXmanyFetchEager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXmanyFetchEager_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXmanyFetchEager_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmanyFetchEager/"); - if(earResURL != null) { - jpa_core_et_persist_oneXmanyFetchEager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmanyFetchEager/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_oneXmanyFetchEager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientAppmanagednotxTest.java index 1617945650..06bb832237 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXmanyFetchEager_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_oneXmanyFetchEager_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmanyFetchEager_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXmanyFetchEager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXmanyFetchEager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXmanyFetchEager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXmanyFetchEager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXmanyFetchEager_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXmanyFetchEager_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmanyFetchEager/"); - if(earResURL != null) { - jpa_core_et_persist_oneXmanyFetchEager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmanyFetchEager/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_oneXmanyFetchEager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientPmservletTest.java index 6b380600c6..51c8ab6784 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_persist_oneXmanyFetchEager_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_persist_oneXmanyFetchEager = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmanyFetchEager.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmanyFetchEager/"); - if(earResURL != null) { - jpa_core_et_persist_oneXmanyFetchEager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmanyFetchEager/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_oneXmanyFetchEager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientPuservletTest.java index 9305f3edd1..d73eb96ff1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_core_et_persist_oneXmanyFetchEager_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_core_et_persist_oneXmanyFetchEager = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmanyFetchEager.jar"); @@ -144,12 +145,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmanyFetchEager/"); - if(earResURL != null) { - jpa_core_et_persist_oneXmanyFetchEager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmanyFetchEager/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_oneXmanyFetchEager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientStateful3Test.java index 7be0dd035d..1cf6b38585 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXmanyFetchEager_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_oneXmanyFetchEager_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmanyFetchEager_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXmanyFetchEager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXmanyFetchEager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXmanyFetchEager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXmanyFetchEager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXmanyFetchEager_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXmanyFetchEager_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmanyFetchEager/"); - if(earResURL != null) { - jpa_core_et_persist_oneXmanyFetchEager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmanyFetchEager/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_oneXmanyFetchEager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientStateless3Test.java index 73f90578f0..e1a760605b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXmanyFetchEager_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_core_et_persist_oneXmanyFetchEager_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmanyFetchEager_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXmanyFetchEager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXmanyFetchEager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_core_et_persist_oneXmanyFetchEager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_core_et_persist_oneXmanyFetchEager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXmanyFetchEager_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_core_et_persist_oneXmanyFetchEager_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -171,12 +172,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmanyFetchEager/"); - if(earResURL != null) { - jpa_core_et_persist_oneXmanyFetchEager_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmanyFetchEager/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_core_et_persist_oneXmanyFetchEager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientAppmanagedTest.java index 7771cc4c20..3b5853bc46 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientAppmanagedTest.java @@ -98,7 +98,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_packaging_jar_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_ee_packaging_jar_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_jar_appmanaged_vehicle_ejb.jar"); // The class files @@ -123,17 +123,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_ee_packaging_jar_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_ee_packaging_jar_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_ee_packaging_jar_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_ee_packaging_jar_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_ee_packaging_jar_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_ee_packaging_jar_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Ear EnterpriseArchive jpa_ee_packaging_jar_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_jar_vehicles.ear"); @@ -147,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/jar/"); - if(earResURL != null) { - jpa_ee_packaging_jar_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/jar/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_ee_packaging_jar_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientPmservletTest.java index 2f244144a8..a012d19c5d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientPmservletTest.java @@ -151,6 +151,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_ee_packaging_jar_pmservlet_vehicle_web, Client.class, warResURL); + // Ear EnterpriseArchive jpa_ee_packaging_jar_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_jar_vehicles.ear"); @@ -162,12 +163,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/jar/"); - if(earResURL != null) { - jpa_ee_packaging_jar_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/jar/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_ee_packaging_jar_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientStateful3Test.java index 62f9579018..c4c43621b7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientStateful3Test.java @@ -98,7 +98,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_packaging_jar_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_ee_packaging_jar_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_jar_stateful3_vehicle_ejb.jar"); // The class files @@ -123,17 +123,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_ee_packaging_jar_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_ee_packaging_jar_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_ee_packaging_jar_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_ee_packaging_jar_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_ee_packaging_jar_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_ee_packaging_jar_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Ear EnterpriseArchive jpa_ee_packaging_jar_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_jar_vehicles.ear"); @@ -147,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/jar/"); - if(earResURL != null) { - jpa_ee_packaging_jar_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/jar/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_ee_packaging_jar_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientStateless3Test.java index cc8cf801e0..654c225aa3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientStateless3Test.java @@ -98,7 +98,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_packaging_jar_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_ee_packaging_jar_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_jar_stateless3_vehicle_ejb.jar"); // The class files @@ -123,17 +123,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_ee_packaging_jar_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_ee_packaging_jar_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_ee_packaging_jar_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_ee_packaging_jar_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_ee_packaging_jar_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_ee_packaging_jar_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Ear EnterpriseArchive jpa_ee_packaging_jar_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_jar_vehicles.ear"); @@ -147,12 +148,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/jar/"); - if(earResURL != null) { - jpa_ee_packaging_jar_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/packaging/jar/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_ee_packaging_jar_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientAppmanagedTest.java index 4283dc3163..c6c181729e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_generators_tablegenerators_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_generators_tablegenerators_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_generators_tablegenerators_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_generators_tablegenerators_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_generators_tablegenerators_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_generators_tablegenerators_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_generators_tablegenerators_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_generators_tablegenerators_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_generators_tablegenerators_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/generators/tablegenerators/"); - if(earResURL != null) { - jpa_jpa22_generators_tablegenerators_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/generators/tablegenerators/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_generators_tablegenerators_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientAppmanagednotxTest.java index 81c2573626..7bfc76adcd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_generators_tablegenerators_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_generators_tablegenerators_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_generators_tablegenerators_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_generators_tablegenerators_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_generators_tablegenerators_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_generators_tablegenerators_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_generators_tablegenerators_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_generators_tablegenerators_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_generators_tablegenerators_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/generators/tablegenerators/"); - if(earResURL != null) { - jpa_jpa22_generators_tablegenerators_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/generators/tablegenerators/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_generators_tablegenerators_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientPmservletTest.java index ae07f02ac8..11991756ea 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_jpa22_generators_tablegenerators_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_jpa22_generators_tablegenerators = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_generators_tablegenerators.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/generators/tablegenerators/"); - if(earResURL != null) { - jpa_jpa22_generators_tablegenerators_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/generators/tablegenerators/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_generators_tablegenerators_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientPuservletTest.java index f970414a15..0fcabd769c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_jpa22_generators_tablegenerators_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_jpa22_generators_tablegenerators = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_generators_tablegenerators.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/generators/tablegenerators/"); - if(earResURL != null) { - jpa_jpa22_generators_tablegenerators_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/generators/tablegenerators/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_generators_tablegenerators_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientStateful3Test.java index 307eb7734d..ffabbba31b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_generators_tablegenerators_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_generators_tablegenerators_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_generators_tablegenerators_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_generators_tablegenerators_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_generators_tablegenerators_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_generators_tablegenerators_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_generators_tablegenerators_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_generators_tablegenerators_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_generators_tablegenerators_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/generators/tablegenerators/"); - if(earResURL != null) { - jpa_jpa22_generators_tablegenerators_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/generators/tablegenerators/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_generators_tablegenerators_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientStateless3Test.java index e2b88b7e62..f80c41be46 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_generators_tablegenerators_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_generators_tablegenerators_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_generators_tablegenerators_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_generators_tablegenerators_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_generators_tablegenerators_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_generators_tablegenerators_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_generators_tablegenerators_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_generators_tablegenerators_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_generators_tablegenerators_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/generators/tablegenerators/"); - if(earResURL != null) { - jpa_jpa22_generators_tablegenerators_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/generators/tablegenerators/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_generators_tablegenerators_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientAppmanagedTest.java index 9be70a3aa4..2a3ed06821 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_query_stream_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_query_stream_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_query_stream_appmanaged_vehicle_ejb.jar"); // The class files @@ -125,17 +125,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_query_stream_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_query_stream_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_query_stream_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_query_stream_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_query_stream_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_query_stream_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/query/stream/"); - if(earResURL != null) { - jpa_jpa22_query_stream_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/query/stream/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_query_stream_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientAppmanagednotxTest.java index 3dce650761..0552a2007d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_query_stream_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_query_stream_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_query_stream_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -125,17 +125,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_query_stream_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_query_stream_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_query_stream_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_query_stream_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_query_stream_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_query_stream_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/query/stream/"); - if(earResURL != null) { - jpa_jpa22_query_stream_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/query/stream/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_query_stream_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientPmservletTest.java index c9a38a7764..dedcbd30a6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientPmservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_jpa22_query_stream_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_jpa22_query_stream = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_query_stream.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/query/stream/"); - if(earResURL != null) { - jpa_jpa22_query_stream_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/query/stream/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_query_stream_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientPuservletTest.java index bd7f5ac84a..07038e984b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientPuservletTest.java @@ -111,6 +111,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_jpa22_query_stream_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_jpa22_query_stream = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_query_stream.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/query/stream/"); - if(earResURL != null) { - jpa_jpa22_query_stream_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/query/stream/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_query_stream_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientStateful3Test.java index ec8849c230..f50d6e948f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_query_stream_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_query_stream_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_query_stream_stateful3_vehicle_ejb.jar"); // The class files @@ -125,17 +125,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_query_stream_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_query_stream_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_query_stream_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_query_stream_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_query_stream_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_query_stream_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/query/stream/"); - if(earResURL != null) { - jpa_jpa22_query_stream_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/query/stream/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_query_stream_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientStateless3Test.java index aae8517e07..0da4f752da 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_query_stream_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_query_stream_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_query_stream_stateless3_vehicle_ejb.jar"); // The class files @@ -125,17 +125,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_query_stream_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_query_stream_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_query_stream_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_query_stream_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_query_stream_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_query_stream_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/query/stream/"); - if(earResURL != null) { - jpa_jpa22_query_stream_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/query/stream/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_query_stream_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientAppmanagedTest.java index 3d812b323e..9e89cdab40 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_attroverride_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_attroverride_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_attroverride_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_attroverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_attroverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_attroverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_attroverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_attroverride_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_attroverride_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/attroverride/"); - if(earResURL != null) { - jpa_jpa22_repeatable_attroverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/attroverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_attroverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientAppmanagednotxTest.java index ce843c7590..83313efa18 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_attroverride_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_attroverride_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_attroverride_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_attroverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_attroverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_attroverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_attroverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_attroverride_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_attroverride_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/attroverride/"); - if(earResURL != null) { - jpa_jpa22_repeatable_attroverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/attroverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_attroverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientPmservletTest.java index ad0c8e3989..a9a57d5d7c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_jpa22_repeatable_attroverride_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_attroverride = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_attroverride.jar"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/attroverride/"); - if(earResURL != null) { - jpa_jpa22_repeatable_attroverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/attroverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_attroverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientPuservletTest.java index 1463ddf233..74cccf0d26 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_jpa22_repeatable_attroverride_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_attroverride = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_attroverride.jar"); @@ -148,12 +149,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/attroverride/"); - if(earResURL != null) { - jpa_jpa22_repeatable_attroverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/attroverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_attroverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientStateful3Test.java index 566e9338dd..7be6a9a70d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_attroverride_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_attroverride_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_attroverride_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_attroverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_attroverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_attroverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_attroverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_attroverride_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_attroverride_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/attroverride/"); - if(earResURL != null) { - jpa_jpa22_repeatable_attroverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/attroverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_attroverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientStateless3Test.java index 2acd25e7cf..a5608e834f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_attroverride_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_attroverride_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_attroverride_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_attroverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_attroverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_attroverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_attroverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_attroverride_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_attroverride_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -175,12 +176,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/attroverride/"); - if(earResURL != null) { - jpa_jpa22_repeatable_attroverride_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/attroverride/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_attroverride_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientAppmanagednotxTest.java index c693f95dfa..4e0f9c1e2b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientAppmanagednotxTest.java @@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_converts_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_converts_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_converts_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -120,17 +120,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_converts_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_converts_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_converts_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_converts_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_converts_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_converts_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/convert/"); - if(earResURL != null) { - jpa_jpa22_repeatable_converts_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/convert/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_converts_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientPmservletTest.java index dd3ce4a757..26198c1ae4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientPmservletTest.java @@ -106,6 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_jpa22_repeatable_converts_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_converts = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_converts.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/convert/"); - if(earResURL != null) { - jpa_jpa22_repeatable_converts_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/convert/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_converts_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientPuservletTest.java index 771732f94d..fd2c99466e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientPuservletTest.java @@ -106,6 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_jpa22_repeatable_converts_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_converts = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_converts.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/convert/"); - if(earResURL != null) { - jpa_jpa22_repeatable_converts_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/convert/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_converts_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientStateless3Test.java index 2a0c36b83c..e889eafa5e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientStateless3Test.java @@ -95,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_converts_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_converts_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_converts_stateless3_vehicle_ejb.jar"); // The class files @@ -120,17 +120,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_converts_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_converts_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_converts_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_converts_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_converts_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_converts_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/convert/"); - if(earResURL != null) { - jpa_jpa22_repeatable_converts_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/convert/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_converts_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientAppmanagedTest.java index 3c1cf3ad9e..79c9a1d2f5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_joincolumns_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_joincolumns_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_joincolumns_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_joincolumns_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_joincolumns_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_joincolumns_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_joincolumns_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_joincolumns_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_joincolumns_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/joincolumn/"); - if(earResURL != null) { - jpa_jpa22_repeatable_joincolumns_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/joincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_joincolumns_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientAppmanagednotxTest.java index b5e9756785..31d5de7f3c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_joincolumns_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_joincolumns_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_joincolumns_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_joincolumns_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_joincolumns_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_joincolumns_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_joincolumns_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_joincolumns_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_joincolumns_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/joincolumn/"); - if(earResURL != null) { - jpa_jpa22_repeatable_joincolumns_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/joincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_joincolumns_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientPmservletTest.java index 8933d4b952..b55f767e78 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_jpa22_repeatable_joincolumns_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_joincolumns = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_joincolumns.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/joincolumn/"); - if(earResURL != null) { - jpa_jpa22_repeatable_joincolumns_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/joincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_joincolumns_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientPuservletTest.java index 5cfa8abe40..4eedb91023 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_jpa22_repeatable_joincolumns_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_joincolumns = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_joincolumns.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/joincolumn/"); - if(earResURL != null) { - jpa_jpa22_repeatable_joincolumns_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/joincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_joincolumns_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientStateful3Test.java index 415eabe3fd..e9e22dda7b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_joincolumns_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_joincolumns_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_joincolumns_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_joincolumns_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_joincolumns_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_joincolumns_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_joincolumns_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_joincolumns_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_joincolumns_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/joincolumn/"); - if(earResURL != null) { - jpa_jpa22_repeatable_joincolumns_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/joincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_joincolumns_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientStateless3Test.java index d626a1f42a..a3e34fe684 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_joincolumns_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_joincolumns_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_joincolumns_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_joincolumns_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_joincolumns_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_joincolumns_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_joincolumns_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_joincolumns_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_joincolumns_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/joincolumn/"); - if(earResURL != null) { - jpa_jpa22_repeatable_joincolumns_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/joincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_joincolumns_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientAppmanagedTest.java index f92758d977..7a72de5651 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_mapkeyjoincolumn_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_mapkeyjoincolumn_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_mapkeyjoincolumn_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_mapkeyjoincolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_mapkeyjoincolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_mapkeyjoincolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_mapkeyjoincolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_mapkeyjoincolumn_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_mapkeyjoincolumn_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/mapkeyjoincolumn/"); - if(earResURL != null) { - jpa_jpa22_repeatable_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/mapkeyjoincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientAppmanagednotxTest.java index 96f620a5ec..a7994c54fd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_mapkeyjoincolumn_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/mapkeyjoincolumn/"); - if(earResURL != null) { - jpa_jpa22_repeatable_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/mapkeyjoincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientPmservletTest.java index 2f7173944c..9dfdc046e2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_jpa22_repeatable_mapkeyjoincolumn_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_mapkeyjoincolumn = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_mapkeyjoincolumn.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/mapkeyjoincolumn/"); - if(earResURL != null) { - jpa_jpa22_repeatable_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/mapkeyjoincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientPuservletTest.java index 0b353ed2da..9d868e8542 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_jpa22_repeatable_mapkeyjoincolumn_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_mapkeyjoincolumn = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_mapkeyjoincolumn.jar"); @@ -145,12 +146,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/mapkeyjoincolumn/"); - if(earResURL != null) { - jpa_jpa22_repeatable_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/mapkeyjoincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientStateful3Test.java index 06acdc47c9..8094ac1cfd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_mapkeyjoincolumn_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_mapkeyjoincolumn_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_mapkeyjoincolumn_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_mapkeyjoincolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_mapkeyjoincolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_mapkeyjoincolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_mapkeyjoincolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_mapkeyjoincolumn_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_mapkeyjoincolumn_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/mapkeyjoincolumn/"); - if(earResURL != null) { - jpa_jpa22_repeatable_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/mapkeyjoincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientStateless3Test.java index 442450ec9d..378c2d7e80 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_mapkeyjoincolumn_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_mapkeyjoincolumn_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_mapkeyjoincolumn_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_mapkeyjoincolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_mapkeyjoincolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_mapkeyjoincolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_mapkeyjoincolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_mapkeyjoincolumn_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_mapkeyjoincolumn_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -172,12 +173,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/mapkeyjoincolumn/"); - if(earResURL != null) { - jpa_jpa22_repeatable_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/mapkeyjoincolumn/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_mapkeyjoincolumn_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientAppmanagedTest.java index 49da793eaa..75a9f87ab5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namedentitygraph_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_namedentitygraph_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedentitygraph_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namedentitygraph_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namedentitygraph_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namedentitygraph_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namedentitygraph_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namedentitygraph_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namedentitygraph_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedentitygraph/"); - if(earResURL != null) { - jpa_jpa22_repeatable_namedentitygraph_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedentitygraph/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_namedentitygraph_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientAppmanagednotxTest.java index 0fadc01bf3..b609b598d9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namedentitygraph_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_namedentitygraph_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedentitygraph_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namedentitygraph_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namedentitygraph_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namedentitygraph_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namedentitygraph_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namedentitygraph_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namedentitygraph_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedentitygraph/"); - if(earResURL != null) { - jpa_jpa22_repeatable_namedentitygraph_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedentitygraph/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_namedentitygraph_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientPmservletTest.java index 38f4340f8e..14503ff5ca 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_jpa22_repeatable_namedentitygraph_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_namedentitygraph = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedentitygraph.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedentitygraph/"); - if(earResURL != null) { - jpa_jpa22_repeatable_namedentitygraph_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedentitygraph/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_namedentitygraph_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientPuservletTest.java index 5ccdd9c0d8..e7ea84a31e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_jpa22_repeatable_namedentitygraph_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_namedentitygraph = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedentitygraph.jar"); @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedentitygraph/"); - if(earResURL != null) { - jpa_jpa22_repeatable_namedentitygraph_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedentitygraph/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_namedentitygraph_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientStateful3Test.java index af0356ba49..976af69e41 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namedentitygraph_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_namedentitygraph_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedentitygraph_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namedentitygraph_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namedentitygraph_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namedentitygraph_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namedentitygraph_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namedentitygraph_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namedentitygraph_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedentitygraph/"); - if(earResURL != null) { - jpa_jpa22_repeatable_namedentitygraph_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedentitygraph/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_namedentitygraph_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientStateless3Test.java index d6e589a8ed..dc77d320bd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namedentitygraph_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_namedentitygraph_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedentitygraph_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namedentitygraph_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namedentitygraph_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namedentitygraph_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namedentitygraph_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namedentitygraph_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namedentitygraph_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedentitygraph/"); - if(earResURL != null) { - jpa_jpa22_repeatable_namedentitygraph_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedentitygraph/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_namedentitygraph_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientAppmanagedTest.java index 120d1e2363..f497b85aab 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namednativequery_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_namednativequery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namednativequery_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namednativequery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namednativequery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namednativequery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namednativequery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namednativequery_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namednativequery_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namednativequery/"); - if(earResURL != null) { - jpa_jpa22_repeatable_namednativequery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namednativequery/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_namednativequery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientAppmanagednotxTest.java index e621fb7f9a..5b7db41927 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namednativequery_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_namednativequery_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namednativequery_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namednativequery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namednativequery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namednativequery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namednativequery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namednativequery_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namednativequery_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namednativequery/"); - if(earResURL != null) { - jpa_jpa22_repeatable_namednativequery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namednativequery/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_namednativequery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientPmservletTest.java index 0e0983e702..135d4b1dcb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_jpa22_repeatable_namednativequery_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_namednativequery = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namednativequery.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namednativequery/"); - if(earResURL != null) { - jpa_jpa22_repeatable_namednativequery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namednativequery/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_namednativequery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientPuservletTest.java index 0f0a62002d..68631aecd2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_jpa22_repeatable_namednativequery_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_namednativequery = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namednativequery.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namednativequery/"); - if(earResURL != null) { - jpa_jpa22_repeatable_namednativequery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namednativequery/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_namednativequery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientStateful3Test.java index 93da07babd..fd2777395b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namednativequery_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_namednativequery_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namednativequery_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namednativequery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namednativequery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namednativequery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namednativequery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namednativequery_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namednativequery_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namednativequery/"); - if(earResURL != null) { - jpa_jpa22_repeatable_namednativequery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namednativequery/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_namednativequery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientStateless3Test.java index e9bca8c39b..2e50ffa743 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namednativequery_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_namednativequery_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namednativequery_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namednativequery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namednativequery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namednativequery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namednativequery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namednativequery_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namednativequery_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namednativequery/"); - if(earResURL != null) { - jpa_jpa22_repeatable_namednativequery_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namednativequery/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_namednativequery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientAppmanagedTest.java index 6ab6abdd6a..d035cd7248 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientAppmanagedTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namedstoredprocedure_appmanaged_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_namedstoredprocedure_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedstoredprocedure_appmanaged_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namedstoredprocedure_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namedstoredprocedure_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namedstoredprocedure_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namedstoredprocedure_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namedstoredprocedure_appmanaged_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namedstoredprocedure_appmanaged_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedstoredprocedurequery/"); - if(earResURL != null) { - jpa_jpa22_repeatable_namedstoredprocedure_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedstoredprocedurequery/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_namedstoredprocedure_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientAppmanagednotxTest.java index 017d0a50b3..8dd44073f9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientAppmanagednotxTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namedstoredprocedure_appmanagedNoTx_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_namedstoredprocedure_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedstoredprocedure_appmanagedNoTx_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namedstoredprocedure_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namedstoredprocedure_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namedstoredprocedure_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namedstoredprocedure_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namedstoredprocedure_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namedstoredprocedure_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedstoredprocedurequery/"); - if(earResURL != null) { - jpa_jpa22_repeatable_namedstoredprocedure_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedstoredprocedurequery/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_namedstoredprocedure_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientPmservletTest.java index 1eeba606c1..bcce04ff5f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientPmservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_jpa22_repeatable_namedstoredprocedure_pmservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_namedstoredprocedure = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedstoredprocedure.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedstoredprocedurequery/"); - if(earResURL != null) { - jpa_jpa22_repeatable_namedstoredprocedure_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedstoredprocedurequery/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_namedstoredprocedure_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientPuservletTest.java index a61de01d8b..7eaee39c80 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientPuservletTest.java @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processWebArchive(jpa_jpa22_repeatable_namedstoredprocedure_puservlet_vehicle_web, Client.class, warResURL); + // Par // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_namedstoredprocedure = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedstoredprocedure.jar"); @@ -143,12 +144,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedstoredprocedurequery/"); - if(earResURL != null) { - jpa_jpa22_repeatable_namedstoredprocedure_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedstoredprocedurequery/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_namedstoredprocedure_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientStateful3Test.java index 662ffc74fa..432c98db08 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientStateful3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namedstoredprocedure_stateful3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_namedstoredprocedure_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedstoredprocedure_stateful3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namedstoredprocedure_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namedstoredprocedure_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namedstoredprocedure_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namedstoredprocedure_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namedstoredprocedure_stateful3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namedstoredprocedure_stateful3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedstoredprocedurequery/"); - if(earResURL != null) { - jpa_jpa22_repeatable_namedstoredprocedure_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedstoredprocedurequery/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_namedstoredprocedure_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientStateless3Test.java index bd2936ef0c..d6e010f325 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientStateless3Test.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namedstoredprocedure_stateless3_vehicle_client, Client.class, resURL); - // Ejb + // Ejb 1 // the jar with the correct archive name JavaArchive jpa_jpa22_repeatable_namedstoredprocedure_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedstoredprocedure_stateless3_vehicle_ejb.jar"); // The class files @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namedstoredprocedure_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); + URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namedstoredprocedure_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); - if(ejbResURL != null) { - jpa_jpa22_repeatable_namedstoredprocedure_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + if(ejbResURL1 != null) { + jpa_jpa22_repeatable_namedstoredprocedure_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } // Call the archive processor - archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namedstoredprocedure_stateless3_vehicle_ejb, Client.class, ejbResURL); + archiveProcessor.processEjbArchive(jpa_jpa22_repeatable_namedstoredprocedure_stateless3_vehicle_ejb, Client.class, ejbResURL1); + // Par // the jar with the correct archive name @@ -170,12 +171,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The application.xml descriptor - URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedstoredprocedurequery/"); - if(earResURL != null) { - jpa_jpa22_repeatable_namedstoredprocedure_vehicles_ear.addAsManifestResource(earResURL, "application.xml"); - } + URL earResURL = null; // The sun-application.xml descriptor - earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/jpa22/repeatable/namedstoredprocedurequery/.ear.sun-application.xml"); + earResURL = Client.class.getResource("/.ear.sun-application.xml"); if(earResURL != null) { jpa_jpa22_repeatable_namedstoredprocedure_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); }