Addresses #1738 for the JPA web profile tests

Signed-off-by: Scott M Stark <[email protected]>
jakartaee · Jan 14, 2025 · 221cc39 · 221cc39
1 parent f5f2728
commit 221cc39
Show file tree

Hide file tree

Showing 405 changed files with 1,215 additions and 9,309 deletions.
diff --git a/...-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPuservletTest.java b/...-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPuservletTest.java
@@ -59,7 +59,7 @@ public class ClientPuservletTest 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_puservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_EntityGraph_puservlet_vehicle_web.war");
@@ -147,28 +147,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_puservlet_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_puservlet_vehicle_web.addAsLibrary(jpa_core_EntityGraph);
+            return jpa_core_EntityGraph_puservlet_vehicle_web;
         }
 
         @Test

diff --git a/.../main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1PmservletTest.java b/.../main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1PmservletTest.java
@@ -59,7 +59,7 @@ public class Client1PmservletTest extends ee.jakarta.tck.persistence.core.Stored
         @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_StoredProcedureQuery_pmservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_StoredProcedureQuery_pmservlet_vehicle_web.war");
@@ -147,28 +147,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
               jpa_core_StoredProcedureQuery.addAsManifestResource(parURL, "orm.xml");
             }
 
-        // Ear
-            EnterpriseArchive jpa_core_StoredProcedureQuery_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_StoredProcedureQuery_vehicles.ear");
-
-            // Any libraries added to the ear
-
-            // The component jars built by the package target
-            jpa_core_StoredProcedureQuery_vehicles_ear.addAsModule(jpa_core_StoredProcedureQuery_pmservlet_vehicle_web);
-
-            jpa_core_StoredProcedureQuery_vehicles_ear.addAsLibrary(jpa_core_StoredProcedureQuery);
-
-
-
-            // 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_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml");
-            }
-            // Call the archive processor
-            archiveProcessor.processEarArchive(jpa_core_StoredProcedureQuery_vehicles_ear, Client1.class, earResURL);
-        return jpa_core_StoredProcedureQuery_vehicles_ear;
+            jpa_core_StoredProcedureQuery_pmservlet_vehicle_web.addAsLibrary(jpa_core_StoredProcedureQuery);
+            return jpa_core_StoredProcedureQuery_pmservlet_vehicle_web;
         }
 
         @Test

diff --git a/.../main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1PuservletTest.java b/.../main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1PuservletTest.java
@@ -59,7 +59,7 @@ public class Client1PuservletTest extends ee.jakarta.tck.persistence.core.Stored
         @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_StoredProcedureQuery_puservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_StoredProcedureQuery_puservlet_vehicle_web.war");
@@ -146,28 +146,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
               jpa_core_StoredProcedureQuery.addAsManifestResource(parURL, "orm.xml");
             }
 
-        // Ear
-            EnterpriseArchive jpa_core_StoredProcedureQuery_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_StoredProcedureQuery_vehicles.ear");
-
-            // Any libraries added to the ear
-
-            // The component jars built by the package target
-            jpa_core_StoredProcedureQuery_vehicles_ear.addAsModule(jpa_core_StoredProcedureQuery_puservlet_vehicle_web);
-
-            jpa_core_StoredProcedureQuery_vehicles_ear.addAsLibrary(jpa_core_StoredProcedureQuery);
-
-
-
-            // 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_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml");
-            }
-            // Call the archive processor
-            archiveProcessor.processEarArchive(jpa_core_StoredProcedureQuery_vehicles_ear, Client1.class, earResURL);
-        return jpa_core_StoredProcedureQuery_vehicles_ear;
+            jpa_core_StoredProcedureQuery_puservlet_vehicle_web.addAsLibrary(jpa_core_StoredProcedureQuery);
+            return jpa_core_StoredProcedureQuery_puservlet_vehicle_web;
         }
 
         @Test

diff --git a/.../main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2PmservletTest.java b/.../main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2PmservletTest.java
@@ -59,7 +59,7 @@ public class Client2PmservletTest extends ee.jakarta.tck.persistence.core.Stored
         @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_StoredProcedureQuery_pmservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_StoredProcedureQuery_pmservlet_vehicle_web.war");
@@ -146,28 +146,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
               jpa_core_StoredProcedureQuery.addAsManifestResource(parURL, "orm.xml");
             }
 
-        // Ear
-            EnterpriseArchive jpa_core_StoredProcedureQuery_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_StoredProcedureQuery_vehicles.ear");
-
-            // Any libraries added to the ear
-
-            // The component jars built by the package target
-            jpa_core_StoredProcedureQuery_vehicles_ear.addAsModule(jpa_core_StoredProcedureQuery_pmservlet_vehicle_web);
-
-            jpa_core_StoredProcedureQuery_vehicles_ear.addAsLibrary(jpa_core_StoredProcedureQuery);
-
-
-
-            // 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_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml");
-            }
-            // Call the archive processor
-            archiveProcessor.processEarArchive(jpa_core_StoredProcedureQuery_vehicles_ear, Client2.class, earResURL);
-        return jpa_core_StoredProcedureQuery_vehicles_ear;
+            jpa_core_StoredProcedureQuery_pmservlet_vehicle_web.addAsLibrary(jpa_core_StoredProcedureQuery);
+            return jpa_core_StoredProcedureQuery_pmservlet_vehicle_web;
         }
 
         @Test

diff --git a/.../main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2PuservletTest.java b/.../main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2PuservletTest.java
@@ -59,7 +59,7 @@ public class Client2PuservletTest extends ee.jakarta.tck.persistence.core.Stored
         @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_StoredProcedureQuery_puservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_StoredProcedureQuery_puservlet_vehicle_web.war");
@@ -146,28 +146,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
               jpa_core_StoredProcedureQuery.addAsManifestResource(parURL, "orm.xml");
             }
 
-        // Ear
-            EnterpriseArchive jpa_core_StoredProcedureQuery_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_StoredProcedureQuery_vehicles.ear");
-
-            // Any libraries added to the ear
-
-            // The component jars built by the package target
-            jpa_core_StoredProcedureQuery_vehicles_ear.addAsModule(jpa_core_StoredProcedureQuery_puservlet_vehicle_web);
-
-            jpa_core_StoredProcedureQuery_vehicles_ear.addAsLibrary(jpa_core_StoredProcedureQuery);
-
-
-
-            // 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_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml");
-            }
-            // Call the archive processor
-            archiveProcessor.processEarArchive(jpa_core_StoredProcedureQuery_vehicles_ear, Client2.class, earResURL);
-        return jpa_core_StoredProcedureQuery_vehicles_ear;
+            jpa_core_StoredProcedureQuery_puservlet_vehicle_web.addAsLibrary(jpa_core_StoredProcedureQuery);
+            return jpa_core_StoredProcedureQuery_puservlet_vehicle_web;
         }
 
         @Test

diff --git a/...n/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1PmservletTest.java b/...n/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1PmservletTest.java
@@ -59,7 +59,7 @@ public class Client1PmservletTest extends ee.jakarta.tck.persistence.core.annota
         @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_annotations_access_field_pmservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_field_pmservlet_vehicle_web.war");
@@ -146,28 +146,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
               jpa_core_annotations_access_field.addAsManifestResource(parURL, "orm.xml");
             }
 
-        // Ear
-            EnterpriseArchive jpa_core_annotations_access_field_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_access_field_vehicles.ear");
-
-            // Any libraries added to the ear
-
-            // The component jars built by the package target
-            jpa_core_annotations_access_field_vehicles_ear.addAsModule(jpa_core_annotations_access_field_pmservlet_vehicle_web);
-
-            jpa_core_annotations_access_field_vehicles_ear.addAsLibrary(jpa_core_annotations_access_field);
-
-
-
-            // 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_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml");
-            }
-            // Call the archive processor
-            archiveProcessor.processEarArchive(jpa_core_annotations_access_field_vehicles_ear, Client1.class, earResURL);
-        return jpa_core_annotations_access_field_vehicles_ear;
+            jpa_core_annotations_access_field_pmservlet_vehicle_web.addAsLibrary(jpa_core_annotations_access_field);
+            return jpa_core_annotations_access_field_pmservlet_vehicle_web;
         }
 
         @Test

diff --git a/...n/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1PuservletTest.java b/...n/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1PuservletTest.java
@@ -59,7 +59,7 @@ public class Client1PuservletTest extends ee.jakarta.tck.persistence.core.annota
         @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_annotations_access_field_puservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_field_puservlet_vehicle_web.war");
@@ -146,28 +146,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
               jpa_core_annotations_access_field.addAsManifestResource(parURL, "orm.xml");
             }
 
-        // Ear
-            EnterpriseArchive jpa_core_annotations_access_field_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_access_field_vehicles.ear");
-
-            // Any libraries added to the ear
-
-            // The component jars built by the package target
-            jpa_core_annotations_access_field_vehicles_ear.addAsModule(jpa_core_annotations_access_field_puservlet_vehicle_web);
-
-            jpa_core_annotations_access_field_vehicles_ear.addAsLibrary(jpa_core_annotations_access_field);
-
-
-
-            // 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_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml");
-            }
-            // Call the archive processor
-            archiveProcessor.processEarArchive(jpa_core_annotations_access_field_vehicles_ear, Client1.class, earResURL);
-        return jpa_core_annotations_access_field_vehicles_ear;
+            jpa_core_annotations_access_field_puservlet_vehicle_web.addAsLibrary(jpa_core_annotations_access_field);
+            return jpa_core_annotations_access_field_puservlet_vehicle_web;
         }
 
         @Test

diff --git a/...n/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2PmservletTest.java b/...n/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2PmservletTest.java
@@ -59,7 +59,7 @@ public class Client2PmservletTest extends ee.jakarta.tck.persistence.core.annota
         @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_annotations_access_field_pmservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_field_pmservlet_vehicle_web.war");
@@ -146,28 +146,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
               jpa_core_annotations_access_field.addAsManifestResource(parURL, "orm.xml");
             }
 
-        // Ear
-            EnterpriseArchive jpa_core_annotations_access_field_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_access_field_vehicles.ear");
-
-            // Any libraries added to the ear
-
-            // The component jars built by the package target
-            jpa_core_annotations_access_field_vehicles_ear.addAsModule(jpa_core_annotations_access_field_pmservlet_vehicle_web);
-
-            jpa_core_annotations_access_field_vehicles_ear.addAsLibrary(jpa_core_annotations_access_field);
-
-
-
-            // 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_annotations_access_field_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml");
-            }
-            // Call the archive processor
-            archiveProcessor.processEarArchive(jpa_core_annotations_access_field_vehicles_ear, Client2.class, earResURL);
-        return jpa_core_annotations_access_field_vehicles_ear;
+            jpa_core_annotations_access_field_pmservlet_vehicle_web.addAsLibrary(jpa_core_annotations_access_field);
+            return jpa_core_annotations_access_field_pmservlet_vehicle_web;
         }
 
         @Test