From 443a071754ae94b3245c58206504e2c2b6536a5d Mon Sep 17 00:00:00 2001 From: Scott M Stark Date: Tue, 14 Jan 2025 21:40:56 -0600 Subject: [PATCH] Fix remaining web profile tests using an EAR artifact. Fixes #1759 Signed-off-by: Scott M Stark --- .../core/EntityGraph/ClientPmservletTest.java | 27 +++---------------- .../CriteriaQuery/Client1PmservletTest.java | 27 +++---------------- .../CriteriaQuery/Client4PmservletTest.java | 27 +++---------------- .../CriteriaQuery/Client4PuservletTest.java | 27 +++---------------- .../CriteriaQuery/Client5PmservletTest.java | 27 +++---------------- .../CriteriaQuery/Client6PmservletTest.java | 27 +++---------------- .../CriteriaQuery/Client7PmservletTest.java | 27 +++---------------- .../From/Client3PmservletTest.java | 27 +++---------------- .../Join/Client2PuservletTest.java | 27 +++---------------- .../metamodelquery/Client1PuservletTest.java | 27 +++---------------- .../metamodelquery/Client2PuservletTest.java | 27 +++---------------- .../misc/Client3PuservletTest.java | 27 +++---------------- .../parameter/Client2PmservletTest.java | 27 +++---------------- .../derivedid/ex4a/ClientPuservletTest.java | 27 +++---------------- .../derivedid/ex4b/ClientPuservletTest.java | 27 +++---------------- .../derivedid/ex5b/ClientPmservletTest.java | 27 +++---------------- .../derivedid/ex5b/ClientPuservletTest.java | 27 +++---------------- .../derivedid/ex6a/ClientPuservletTest.java | 27 +++---------------- .../derivedid/ex6b/ClientPuservletTest.java | 27 +++---------------- .../entityManager/Client1PmservletTest.java | 27 +++---------------- .../entityManager/Client2PmservletTest.java | 27 +++---------------- .../entityManager/Client2PuservletTest.java | 27 +++---------------- .../entityManager/Client3PmservletTest.java | 27 +++---------------- .../entityManager2/Client1PuservletTest.java | 27 +++---------------- .../entityManager2/Client2PuservletTest.java | 27 +++---------------- .../Client2PmservletTest.java | 27 +++---------------- .../Client2PuservletTest.java | 27 +++---------------- .../Client3PmservletTest.java | 27 +++---------------- .../apitests/ClientPmservletTest.java | 27 +++---------------- .../oneXmany/ClientPuservletTest.java | 27 +++---------------- .../ee/packaging/web/scope/ClientTest.java | 20 ++------------ .../ee/propagation/cm/jta/ClientTest.java | 26 +++--------------- tools/signaturetest/pom.xml | 1 + 33 files changed, 97 insertions(+), 760 deletions(-) diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPmservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPmservletTest.java index d9800a2e48..728c4e9721 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPmservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPmservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -56,7 +55,7 @@ public class ClientPmservletTest extends ee.jakarta.tck.persistence.core.EntityG @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_EntityGraph_pmservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_EntityGraph_pmservlet_vehicle_web.war"); @@ -143,28 +142,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_EntityGraph.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_EntityGraph_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_EntityGraph_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_EntityGraph_vehicles_ear.addAsModule(jpa_core_EntityGraph_pmservlet_vehicle_web); - - jpa_core_EntityGraph_vehicles_ear.addAsLibrary(jpa_core_EntityGraph); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_EntityGraph_vehicles_ear, Client.class, earResURL); - return jpa_core_EntityGraph_vehicles_ear; + jpa_core_EntityGraph_pmservlet_vehicle_web.addAsLibrary(jpa_core_EntityGraph); + return jpa_core_EntityGraph_pmservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1PmservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1PmservletTest.java index 7a24d3180b..59d7ba4e50 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1PmservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1PmservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -56,7 +55,7 @@ public class Client1PmservletTest extends ee.jakarta.tck.persistence.core.criter @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web.war"); @@ -177,28 +176,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriaapi_CriteriaQuery.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_criteriaapi_CriteriaQuery_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsModule(jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web); - - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsLibrary(jpa_core_criteriaapi_CriteriaQuery); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_criteriaapi_CriteriaQuery_vehicles_ear, Client1.class, earResURL); - return jpa_core_criteriaapi_CriteriaQuery_vehicles_ear; + jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web.addAsLibrary(jpa_core_criteriaapi_CriteriaQuery); + return jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4PmservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4PmservletTest.java index bd23603036..e3305e8b9e 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4PmservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4PmservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -56,7 +55,7 @@ public class Client4PmservletTest extends ee.jakarta.tck.persistence.core.criter @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web.war"); @@ -176,28 +175,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriaapi_CriteriaQuery.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_criteriaapi_CriteriaQuery_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsModule(jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web); - - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsLibrary(jpa_core_criteriaapi_CriteriaQuery); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_criteriaapi_CriteriaQuery_vehicles_ear, Client4.class, earResURL); - return jpa_core_criteriaapi_CriteriaQuery_vehicles_ear; + jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web.addAsLibrary(jpa_core_criteriaapi_CriteriaQuery); + return jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4PuservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4PuservletTest.java index 6ef4bcd8a9..4ca5b6146d 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4PuservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4PuservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -56,7 +55,7 @@ public class Client4PuservletTest extends ee.jakarta.tck.persistence.core.criter @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_criteriaapi_CriteriaQuery_puservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriaapi_CriteriaQuery_puservlet_vehicle_web.war"); @@ -176,28 +175,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriaapi_CriteriaQuery.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_criteriaapi_CriteriaQuery_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsModule(jpa_core_criteriaapi_CriteriaQuery_puservlet_vehicle_web); - - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsLibrary(jpa_core_criteriaapi_CriteriaQuery); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client4.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_criteriaapi_CriteriaQuery_vehicles_ear, Client4.class, earResURL); - return jpa_core_criteriaapi_CriteriaQuery_vehicles_ear; + jpa_core_criteriaapi_CriteriaQuery_puservlet_vehicle_web.addAsLibrary(jpa_core_criteriaapi_CriteriaQuery); + return jpa_core_criteriaapi_CriteriaQuery_puservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5PmservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5PmservletTest.java index 1ccc30017b..142f64016b 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5PmservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5PmservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -56,7 +55,7 @@ public class Client5PmservletTest extends ee.jakarta.tck.persistence.core.criter @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web.war"); @@ -178,28 +177,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriaapi_CriteriaQuery.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_criteriaapi_CriteriaQuery_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsModule(jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web); - - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsLibrary(jpa_core_criteriaapi_CriteriaQuery); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client5.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_criteriaapi_CriteriaQuery_vehicles_ear, Client5.class, earResURL); - return jpa_core_criteriaapi_CriteriaQuery_vehicles_ear; + jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web.addAsLibrary(jpa_core_criteriaapi_CriteriaQuery); + return jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6PmservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6PmservletTest.java index 75b32a8f18..459313593f 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6PmservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6PmservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -56,7 +55,7 @@ public class Client6PmservletTest extends ee.jakarta.tck.persistence.core.criter @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web.war"); @@ -176,28 +175,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriaapi_CriteriaQuery.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_criteriaapi_CriteriaQuery_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsModule(jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web); - - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsLibrary(jpa_core_criteriaapi_CriteriaQuery); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client6.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_criteriaapi_CriteriaQuery_vehicles_ear, Client6.class, earResURL); - return jpa_core_criteriaapi_CriteriaQuery_vehicles_ear; + jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web.addAsLibrary(jpa_core_criteriaapi_CriteriaQuery); + return jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7PmservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7PmservletTest.java index d4f1e3cc03..730602c58b 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7PmservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7PmservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -56,7 +55,7 @@ public class Client7PmservletTest extends ee.jakarta.tck.persistence.core.criter @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web.war"); @@ -176,28 +175,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriaapi_CriteriaQuery.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_criteriaapi_CriteriaQuery_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsModule(jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web); - - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsLibrary(jpa_core_criteriaapi_CriteriaQuery); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client7.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_criteriaapi_CriteriaQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_criteriaapi_CriteriaQuery_vehicles_ear, Client7.class, earResURL); - return jpa_core_criteriaapi_CriteriaQuery_vehicles_ear; + jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web.addAsLibrary(jpa_core_criteriaapi_CriteriaQuery); + return jpa_core_criteriaapi_CriteriaQuery_pmservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3PmservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3PmservletTest.java index bb43816903..769eebe26e 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3PmservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3PmservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -56,7 +55,7 @@ public class Client3PmservletTest extends ee.jakarta.tck.persistence.core.criter @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_criteriaapi_From_pmservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriaapi_From_pmservlet_vehicle_web.war"); @@ -176,28 +175,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriaapi_From.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_criteriaapi_From_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_criteriaapi_From_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_criteriaapi_From_vehicles_ear.addAsModule(jpa_core_criteriaapi_From_pmservlet_vehicle_web); - - jpa_core_criteriaapi_From_vehicles_ear.addAsLibrary(jpa_core_criteriaapi_From); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_criteriaapi_From_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_criteriaapi_From_vehicles_ear, Client3.class, earResURL); - return jpa_core_criteriaapi_From_vehicles_ear; + jpa_core_criteriaapi_From_pmservlet_vehicle_web.addAsLibrary(jpa_core_criteriaapi_From); + return jpa_core_criteriaapi_From_pmservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2PuservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2PuservletTest.java index 567802a24a..b72d9527ab 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2PuservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2PuservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -56,7 +55,7 @@ public class Client2PuservletTest extends ee.jakarta.tck.persistence.core.criter @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_criteriaapi_Join_puservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriaapi_Join_puservlet_vehicle_web.war"); @@ -176,28 +175,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriaapi_Join.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_criteriaapi_Join_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_criteriaapi_Join_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_criteriaapi_Join_vehicles_ear.addAsModule(jpa_core_criteriaapi_Join_puservlet_vehicle_web); - - jpa_core_criteriaapi_Join_vehicles_ear.addAsLibrary(jpa_core_criteriaapi_Join); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_criteriaapi_Join_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_criteriaapi_Join_vehicles_ear, Client2.class, earResURL); - return jpa_core_criteriaapi_Join_vehicles_ear; + jpa_core_criteriaapi_Join_puservlet_vehicle_web.addAsLibrary(jpa_core_criteriaapi_Join); + return jpa_core_criteriaapi_Join_puservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1PuservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1PuservletTest.java index 66cbe68e42..ce54b70122 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1PuservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1PuservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -56,7 +55,7 @@ public class Client1PuservletTest extends ee.jakarta.tck.persistence.core.criter @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_criteriaapi_metamodelquery_puservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriaapi_metamodelquery_puservlet_vehicle_web.war"); @@ -175,28 +174,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriaapi_metamodelquery.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_criteriaapi_metamodelquery_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsModule(jpa_core_criteriaapi_metamodelquery_puservlet_vehicle_web); - - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsLibrary(jpa_core_criteriaapi_metamodelquery); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_criteriaapi_metamodelquery_vehicles_ear, Client1.class, earResURL); - return jpa_core_criteriaapi_metamodelquery_vehicles_ear; + jpa_core_criteriaapi_metamodelquery_puservlet_vehicle_web.addAsLibrary(jpa_core_criteriaapi_metamodelquery); + return jpa_core_criteriaapi_metamodelquery_puservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2PuservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2PuservletTest.java index 178223f192..efee0a1645 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2PuservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2PuservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -56,7 +55,7 @@ public class Client2PuservletTest extends ee.jakarta.tck.persistence.core.criter @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_criteriaapi_metamodelquery_puservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriaapi_metamodelquery_puservlet_vehicle_web.war"); @@ -176,28 +175,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriaapi_metamodelquery.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_criteriaapi_metamodelquery_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsModule(jpa_core_criteriaapi_metamodelquery_puservlet_vehicle_web); - - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsLibrary(jpa_core_criteriaapi_metamodelquery); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_criteriaapi_metamodelquery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_criteriaapi_metamodelquery_vehicles_ear, Client2.class, earResURL); - return jpa_core_criteriaapi_metamodelquery_vehicles_ear; + jpa_core_criteriaapi_metamodelquery_puservlet_vehicle_web.addAsLibrary(jpa_core_criteriaapi_metamodelquery); + return jpa_core_criteriaapi_metamodelquery_puservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3PuservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3PuservletTest.java index 8b9ae66bfc..4b034eb818 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3PuservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3PuservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -56,7 +55,7 @@ public class Client3PuservletTest extends ee.jakarta.tck.persistence.core.criter @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_criteriaapi_misc_puservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriaapi_misc_puservlet_vehicle_web.war"); @@ -176,28 +175,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriaapi_misc.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_criteriaapi_misc_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_criteriaapi_misc_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_criteriaapi_misc_vehicles_ear.addAsModule(jpa_core_criteriaapi_misc_puservlet_vehicle_web); - - jpa_core_criteriaapi_misc_vehicles_ear.addAsLibrary(jpa_core_criteriaapi_misc); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_criteriaapi_misc_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_criteriaapi_misc_vehicles_ear, Client3.class, earResURL); - return jpa_core_criteriaapi_misc_vehicles_ear; + jpa_core_criteriaapi_misc_puservlet_vehicle_web.addAsLibrary(jpa_core_criteriaapi_misc); + return jpa_core_criteriaapi_misc_puservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2PmservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2PmservletTest.java index 73447e7c25..0fdb0b81c0 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2PmservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2PmservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -56,7 +55,7 @@ public class Client2PmservletTest extends ee.jakarta.tck.persistence.core.criter @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_criteriaapi_parameter_pmservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_criteriaapi_parameter_pmservlet_vehicle_web.war"); @@ -142,28 +141,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriaapi_parameter.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_criteriaapi_parameter_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_criteriaapi_parameter_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_criteriaapi_parameter_vehicles_ear.addAsModule(jpa_core_criteriaapi_parameter_pmservlet_vehicle_web); - - jpa_core_criteriaapi_parameter_vehicles_ear.addAsLibrary(jpa_core_criteriaapi_parameter); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_criteriaapi_parameter_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_criteriaapi_parameter_vehicles_ear, Client2.class, earResURL); - return jpa_core_criteriaapi_parameter_vehicles_ear; + jpa_core_criteriaapi_parameter_pmservlet_vehicle_web.addAsLibrary(jpa_core_criteriaapi_parameter); + return jpa_core_criteriaapi_parameter_pmservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientPuservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientPuservletTest.java index 95a2515dc5..9fe73b0b06 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientPuservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientPuservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -56,7 +55,7 @@ public class ClientPuservletTest extends ee.jakarta.tck.persistence.core.derived @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_deriverdid_ex4a_puservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_deriverdid_ex4a_puservlet_vehicle_web.war"); @@ -141,28 +140,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex4a.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_deriverdid_ex4a_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_deriverdid_ex4a_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_deriverdid_ex4a_vehicles_ear.addAsModule(jpa_core_deriverdid_ex4a_puservlet_vehicle_web); - - jpa_core_deriverdid_ex4a_vehicles_ear.addAsLibrary(jpa_core_deriverdid_ex4a); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_deriverdid_ex4a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_deriverdid_ex4a_vehicles_ear, Client.class, earResURL); - return jpa_core_deriverdid_ex4a_vehicles_ear; + jpa_core_deriverdid_ex4a_puservlet_vehicle_web.addAsLibrary(jpa_core_deriverdid_ex4a); + return jpa_core_deriverdid_ex4a_puservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientPuservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientPuservletTest.java index e2c105996f..cd472a9624 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientPuservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientPuservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -56,7 +55,7 @@ public class ClientPuservletTest extends ee.jakarta.tck.persistence.core.derived @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_deriverdid_ex4b_puservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_deriverdid_ex4b_puservlet_vehicle_web.war"); @@ -141,28 +140,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex4b.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_deriverdid_ex4b_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_deriverdid_ex4b_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_deriverdid_ex4b_vehicles_ear.addAsModule(jpa_core_deriverdid_ex4b_puservlet_vehicle_web); - - jpa_core_deriverdid_ex4b_vehicles_ear.addAsLibrary(jpa_core_deriverdid_ex4b); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_deriverdid_ex4b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_deriverdid_ex4b_vehicles_ear, Client.class, earResURL); - return jpa_core_deriverdid_ex4b_vehicles_ear; + jpa_core_deriverdid_ex4b_puservlet_vehicle_web.addAsLibrary(jpa_core_deriverdid_ex4b); + return jpa_core_deriverdid_ex4b_puservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPmservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPmservletTest.java index 4ba0c4610d..6d626d3052 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPmservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPmservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -56,7 +55,7 @@ public class ClientPmservletTest extends ee.jakarta.tck.persistence.core.derived @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_deriverdid_ex5b_pmservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_deriverdid_ex5b_pmservlet_vehicle_web.war"); @@ -142,28 +141,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex5b.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_deriverdid_ex5b_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_deriverdid_ex5b_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_deriverdid_ex5b_vehicles_ear.addAsModule(jpa_core_deriverdid_ex5b_pmservlet_vehicle_web); - - jpa_core_deriverdid_ex5b_vehicles_ear.addAsLibrary(jpa_core_deriverdid_ex5b); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_deriverdid_ex5b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_deriverdid_ex5b_vehicles_ear, Client.class, earResURL); - return jpa_core_deriverdid_ex5b_vehicles_ear; + jpa_core_deriverdid_ex5b_pmservlet_vehicle_web.addAsLibrary(jpa_core_deriverdid_ex5b); + return jpa_core_deriverdid_ex5b_pmservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPuservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPuservletTest.java index 281d8d1120..ca6b463704 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPuservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPuservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -56,7 +55,7 @@ public class ClientPuservletTest extends ee.jakarta.tck.persistence.core.derived @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_deriverdid_ex5b_puservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_deriverdid_ex5b_puservlet_vehicle_web.war"); @@ -142,28 +141,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex5b.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_deriverdid_ex5b_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_deriverdid_ex5b_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_deriverdid_ex5b_vehicles_ear.addAsModule(jpa_core_deriverdid_ex5b_puservlet_vehicle_web); - - jpa_core_deriverdid_ex5b_vehicles_ear.addAsLibrary(jpa_core_deriverdid_ex5b); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_deriverdid_ex5b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_deriverdid_ex5b_vehicles_ear, Client.class, earResURL); - return jpa_core_deriverdid_ex5b_vehicles_ear; + jpa_core_deriverdid_ex5b_puservlet_vehicle_web.addAsLibrary(jpa_core_deriverdid_ex5b); + return jpa_core_deriverdid_ex5b_puservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientPuservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientPuservletTest.java index ce21d64a3e..dd15bf0996 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientPuservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientPuservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -56,7 +55,7 @@ public class ClientPuservletTest extends ee.jakarta.tck.persistence.core.derived @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_deriverdid_ex6a_puservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_deriverdid_ex6a_puservlet_vehicle_web.war"); @@ -142,28 +141,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex6a.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_deriverdid_ex6a_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_deriverdid_ex6a_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_deriverdid_ex6a_vehicles_ear.addAsModule(jpa_core_deriverdid_ex6a_puservlet_vehicle_web); - - jpa_core_deriverdid_ex6a_vehicles_ear.addAsLibrary(jpa_core_deriverdid_ex6a); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_deriverdid_ex6a_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_deriverdid_ex6a_vehicles_ear, Client.class, earResURL); - return jpa_core_deriverdid_ex6a_vehicles_ear; + jpa_core_deriverdid_ex6a_puservlet_vehicle_web.addAsLibrary(jpa_core_deriverdid_ex6a); + return jpa_core_deriverdid_ex6a_puservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientPuservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientPuservletTest.java index 84f41f8e6d..0b92d831b8 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientPuservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientPuservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -56,7 +55,7 @@ public class ClientPuservletTest extends ee.jakarta.tck.persistence.core.derived @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_deriverdid_ex6b_puservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_deriverdid_ex6b_puservlet_vehicle_web.war"); @@ -142,28 +141,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex6b.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_deriverdid_ex6b_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_deriverdid_ex6b_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_deriverdid_ex6b_vehicles_ear.addAsModule(jpa_core_deriverdid_ex6b_puservlet_vehicle_web); - - jpa_core_deriverdid_ex6b_vehicles_ear.addAsLibrary(jpa_core_deriverdid_ex6b); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_deriverdid_ex6b_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_deriverdid_ex6b_vehicles_ear, Client.class, earResURL); - return jpa_core_deriverdid_ex6b_vehicles_ear; + jpa_core_deriverdid_ex6b_puservlet_vehicle_web.addAsLibrary(jpa_core_deriverdid_ex6b); + return jpa_core_deriverdid_ex6b_puservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1PmservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1PmservletTest.java index b129daf52d..0cde1845fb 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1PmservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1PmservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -88,7 +87,7 @@ public class Client1PmservletTest extends ee.jakarta.tck.persistence.core.entity @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_entityManager_pmservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_entityManager_pmservlet_vehicle_web.war"); @@ -173,28 +172,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entityManager.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_entityManager_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_entityManager_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_entityManager_vehicles_ear.addAsModule(jpa_core_entityManager_pmservlet_vehicle_web); - - jpa_core_entityManager_vehicles_ear.addAsLibrary(jpa_core_entityManager); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_entityManager_vehicles_ear, Client1.class, earResURL); - return jpa_core_entityManager_vehicles_ear; + jpa_core_entityManager_pmservlet_vehicle_web.addAsLibrary(jpa_core_entityManager); + return jpa_core_entityManager_pmservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2PmservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2PmservletTest.java index f7bae2f463..959c364d5f 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2PmservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2PmservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -88,7 +87,7 @@ public class Client2PmservletTest extends ee.jakarta.tck.persistence.core.entity @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_entityManager_pmservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_entityManager_pmservlet_vehicle_web.war"); @@ -174,28 +173,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entityManager.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_entityManager_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_entityManager_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_entityManager_vehicles_ear.addAsModule(jpa_core_entityManager_pmservlet_vehicle_web); - - jpa_core_entityManager_vehicles_ear.addAsLibrary(jpa_core_entityManager); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_entityManager_vehicles_ear, Client2.class, earResURL); - return jpa_core_entityManager_vehicles_ear; + jpa_core_entityManager_pmservlet_vehicle_web.addAsLibrary(jpa_core_entityManager); + return jpa_core_entityManager_pmservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2PuservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2PuservletTest.java index dfd6310289..27d4e08a50 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2PuservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2PuservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -88,7 +87,7 @@ public class Client2PuservletTest extends ee.jakarta.tck.persistence.core.entity @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_entityManager_puservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_entityManager_puservlet_vehicle_web.war"); @@ -175,28 +174,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entityManager.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_entityManager_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_entityManager_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_entityManager_vehicles_ear.addAsModule(jpa_core_entityManager_puservlet_vehicle_web); - - jpa_core_entityManager_vehicles_ear.addAsLibrary(jpa_core_entityManager); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_entityManager_vehicles_ear, Client2.class, earResURL); - return jpa_core_entityManager_vehicles_ear; + jpa_core_entityManager_puservlet_vehicle_web.addAsLibrary(jpa_core_entityManager); + return jpa_core_entityManager_puservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3PmservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3PmservletTest.java index 18671fe02c..56656de5d5 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3PmservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3PmservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -88,7 +87,7 @@ public class Client3PmservletTest extends ee.jakarta.tck.persistence.core.entity @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_entityManager_pmservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_entityManager_pmservlet_vehicle_web.war"); @@ -173,28 +172,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entityManager.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_entityManager_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_entityManager_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_entityManager_vehicles_ear.addAsModule(jpa_core_entityManager_pmservlet_vehicle_web); - - jpa_core_entityManager_vehicles_ear.addAsLibrary(jpa_core_entityManager); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_entityManager_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_entityManager_vehicles_ear, Client3.class, earResURL); - return jpa_core_entityManager_vehicles_ear; + jpa_core_entityManager_pmservlet_vehicle_web.addAsLibrary(jpa_core_entityManager); + return jpa_core_entityManager_pmservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1PuservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1PuservletTest.java index d534916676..2a336cd16d 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1PuservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1PuservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -52,7 +51,7 @@ public class Client1PuservletTest extends ee.jakarta.tck.persistence.core.entity @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_entityManager2_puservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_entityManager2_puservlet_vehicle_web.war"); @@ -138,28 +137,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entityManager2.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_entityManager2_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_entityManager2_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_entityManager2_vehicles_ear.addAsModule(jpa_core_entityManager2_puservlet_vehicle_web); - - jpa_core_entityManager2_vehicles_ear.addAsLibrary(jpa_core_entityManager2); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client1.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_entityManager2_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_entityManager2_vehicles_ear, Client1.class, earResURL); - return jpa_core_entityManager2_vehicles_ear; + jpa_core_entityManager2_puservlet_vehicle_web.addAsLibrary(jpa_core_entityManager2); + return jpa_core_entityManager2_puservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2PuservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2PuservletTest.java index 2db3f8ace5..01e0102d63 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2PuservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2PuservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -52,7 +51,7 @@ public class Client2PuservletTest extends ee.jakarta.tck.persistence.core.entity @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_entityManager2_puservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_entityManager2_puservlet_vehicle_web.war"); @@ -138,28 +137,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entityManager2.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_entityManager2_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_entityManager2_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_entityManager2_vehicles_ear.addAsModule(jpa_core_entityManager2_puservlet_vehicle_web); - - jpa_core_entityManager2_vehicles_ear.addAsLibrary(jpa_core_entityManager2); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_entityManager2_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_entityManager2_vehicles_ear, Client2.class, earResURL); - return jpa_core_entityManager2_vehicles_ear; + jpa_core_entityManager2_puservlet_vehicle_web.addAsLibrary(jpa_core_entityManager2); + return jpa_core_entityManager2_puservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2PmservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2PmservletTest.java index f90dcb274b..15ddc9123f 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2PmservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2PmservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -68,7 +67,7 @@ public class Client2PmservletTest extends ee.jakarta.tck.persistence.core.entity @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_entityManagerFactory_pmservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_entityManagerFactory_pmservlet_vehicle_web.war"); @@ -155,28 +154,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entityManagerFactory.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_entityManagerFactory_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_entityManagerFactory_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_entityManagerFactory_vehicles_ear.addAsModule(jpa_core_entityManagerFactory_pmservlet_vehicle_web); - - jpa_core_entityManagerFactory_vehicles_ear.addAsLibrary(jpa_core_entityManagerFactory); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_entityManagerFactory_vehicles_ear, Client2.class, earResURL); - return jpa_core_entityManagerFactory_vehicles_ear; + jpa_core_entityManagerFactory_pmservlet_vehicle_web.addAsLibrary(jpa_core_entityManagerFactory); + return jpa_core_entityManagerFactory_pmservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2PuservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2PuservletTest.java index 25c2266e1f..695955bd9b 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2PuservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2PuservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -68,7 +67,7 @@ public class Client2PuservletTest extends ee.jakarta.tck.persistence.core.entity @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_entityManagerFactory_puservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_entityManagerFactory_puservlet_vehicle_web.war"); @@ -155,28 +154,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entityManagerFactory.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_entityManagerFactory_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_entityManagerFactory_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_entityManagerFactory_vehicles_ear.addAsModule(jpa_core_entityManagerFactory_puservlet_vehicle_web); - - jpa_core_entityManagerFactory_vehicles_ear.addAsLibrary(jpa_core_entityManagerFactory); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client2.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_entityManagerFactory_vehicles_ear, Client2.class, earResURL); - return jpa_core_entityManagerFactory_vehicles_ear; + jpa_core_entityManagerFactory_puservlet_vehicle_web.addAsLibrary(jpa_core_entityManagerFactory); + return jpa_core_entityManagerFactory_puservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3PmservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3PmservletTest.java index 188d7bca0e..c0a833e6fa 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3PmservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3PmservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -68,7 +67,7 @@ public class Client3PmservletTest extends ee.jakarta.tck.persistence.core.entity @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_entityManagerFactory_pmservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_entityManagerFactory_pmservlet_vehicle_web.war"); @@ -155,28 +154,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entityManagerFactory.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_entityManagerFactory_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_entityManagerFactory_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_entityManagerFactory_vehicles_ear.addAsModule(jpa_core_entityManagerFactory_pmservlet_vehicle_web); - - jpa_core_entityManagerFactory_vehicles_ear.addAsLibrary(jpa_core_entityManagerFactory); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client3.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_entityManagerFactory_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_entityManagerFactory_vehicles_ear, Client3.class, earResURL); - return jpa_core_entityManagerFactory_vehicles_ear; + jpa_core_entityManagerFactory_pmservlet_vehicle_web.addAsLibrary(jpa_core_entityManagerFactory); + return jpa_core_entityManagerFactory_pmservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientPmservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientPmservletTest.java index cf9eb67f20..a5ba1fc3ee 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientPmservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientPmservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -56,7 +55,7 @@ public class ClientPmservletTest extends ee.jakarta.tck.persistence.core.entityt @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_entitytest_apitests_pmservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_entitytest_apitests_pmservlet_vehicle_web.war"); @@ -143,28 +142,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entitytest_apitests.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_entitytest_apitests_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_entitytest_apitests_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_entitytest_apitests_vehicles_ear.addAsModule(jpa_core_entitytest_apitests_pmservlet_vehicle_web); - - jpa_core_entitytest_apitests_vehicles_ear.addAsLibrary(jpa_core_entitytest_apitests); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_entitytest_apitests_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_entitytest_apitests_vehicles_ear, Client.class, earResURL); - return jpa_core_entitytest_apitests_vehicles_ear; + jpa_core_entitytest_apitests_pmservlet_vehicle_web.addAsLibrary(jpa_core_entitytest_apitests); + return jpa_core_entitytest_apitests_pmservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientPuservletTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientPuservletTest.java index 9e2c4dd4fb..d3d03a7c51 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientPuservletTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientPuservletTest.java @@ -6,7 +6,6 @@ import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.jupiter.api.MethodOrderer; @@ -56,7 +55,7 @@ public class ClientPuservletTest extends ee.jakarta.tck.persistence.core.entityt @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) - public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_core_et_cascadeall_oneXmany_puservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_et_cascadeall_oneXmany_puservlet_vehicle_web.war"); @@ -141,28 +140,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_oneXmany.addAsManifestResource(parURL, "orm.xml"); } - // Ear - EnterpriseArchive jpa_core_et_cascadeall_oneXmany_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_et_cascadeall_oneXmany_vehicles.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_core_et_cascadeall_oneXmany_vehicles_ear.addAsModule(jpa_core_et_cascadeall_oneXmany_puservlet_vehicle_web); - - jpa_core_et_cascadeall_oneXmany_vehicles_ear.addAsLibrary(jpa_core_et_cascadeall_oneXmany); - - - - // The application.xml descriptor - URL earResURL = null; - // The sun-application.xml descriptor - earResURL = Client.class.getResource("/.ear.sun-application.xml"); - if(earResURL != null) { - jpa_core_et_cascadeall_oneXmany_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml"); - } - // Call the archive processor - archiveProcessor.processEarArchive(jpa_core_et_cascadeall_oneXmany_vehicles_ear, Client.class, earResURL); - return jpa_core_et_cascadeall_oneXmany_vehicles_ear; + jpa_core_et_cascadeall_oneXmany_puservlet_vehicle_web.addAsLibrary(jpa_core_et_cascadeall_oneXmany); + return jpa_core_et_cascadeall_oneXmany_puservlet_vehicle_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/ClientTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/ClientTest.java index 1b1b0b6b16..ec4149b3dc 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/ClientTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/ClientTest.java @@ -44,7 +44,7 @@ public class ClientTest extends ee.jakarta.tck.persistence.ee.packaging.web.scop @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = "jpa_ee_packaging_web_scope", order = 2) - public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_ee_packaging_web_scope_web = ShrinkWrap.create(WebArchive.class, "jpa_ee_packaging_web_scope_web.war"); @@ -74,23 +74,7 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive 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"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_ee_packaging_web_scope_ear.addAsModule(jpa_ee_packaging_web_scope_web); - - - - // The application.xml descriptor - URL earResURL = null; - earResURL = Client.class.getResource("/ee/jakarta/tck/persistence/ee/packaging/web/scope/application.xml"); - jpa_ee_packaging_web_scope_ear.addAsManifestResource(earResURL, "application.xml"); - // Call the archive processor - archiveProcessor.processEarArchive(jpa_ee_packaging_web_scope_ear, Client.class, earResURL); - return jpa_ee_packaging_web_scope_ear; + return jpa_ee_packaging_web_scope_web; } @Test diff --git a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/ClientTest.java b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/ClientTest.java index 5b611cd06d..cc2d869510 100644 --- a/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/ClientTest.java +++ b/tcks/apis/persistence/persistence-inside-container/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/ClientTest.java @@ -47,7 +47,7 @@ public class ClientTest extends ee.jakarta.tck.persistence.ee.propagation.cm.jta @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = "jpa_ee_propagation_cm_jta", order = 2) - public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { + public static WebArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) { // War // the war with the correct archive name WebArchive jpa_ee_propagation_cm_jta_web = ShrinkWrap.create(WebArchive.class, "jpa_ee_propagation_cm_jta_web.war"); @@ -109,27 +109,9 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive // Call the archive processor archiveProcessor.processParArchive(jpa_ee_propagation_cm_jta, Client.class, parURL); - // Ear - EnterpriseArchive jpa_ee_propagation_cm_jta_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_propagation_cm_jta.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - jpa_ee_propagation_cm_jta_ear.addAsModule(jpa_ee_propagation_cm_jta_ejb); - jpa_ee_propagation_cm_jta_ear.addAsModule(jpa_ee_propagation_cm_jta_web); - jpa_ee_propagation_cm_jta_ear.addAsModule(jpa_ee_propagation_cm_jta_web); - - jpa_ee_propagation_cm_jta_ear.addAsLibrary(jpa_ee_propagation_cm_jta); - - - - // The application.xml descriptor - URL earResURL = null; - earResURL = Client.class.getResource("/ee/jakarta/tck/persistence/ee/propagation/cm/jta/application.xml"); - jpa_ee_propagation_cm_jta_ear.addAsManifestResource(earResURL, "application.xml"); - // Call the archive processor - archiveProcessor.processEarArchive(jpa_ee_propagation_cm_jta_ear, Client.class, earResURL); - return jpa_ee_propagation_cm_jta_ear; + jpa_ee_propagation_cm_jta_web.addAsLibrary(jpa_ee_propagation_cm_jta); + jpa_ee_propagation_cm_jta_web.addAsLibrary(jpa_ee_propagation_cm_jta_ejb); + return jpa_ee_propagation_cm_jta_web; } @Test diff --git a/tools/signaturetest/pom.xml b/tools/signaturetest/pom.xml index 4bec792ac0..47b848d81c 100644 --- a/tools/signaturetest/pom.xml +++ b/tools/signaturetest/pom.xml @@ -36,6 +36,7 @@ https://github.com/jakartaee/platform-tck + 17 UTF-8 UTF-8