Skip to content

Commit

Permalink
update refactoring based on eclipse-ee4j/jakartaee-tck-tools#129
Browse files Browse the repository at this point in the history 
Signed-off-by: Scott Marlow <smarlow@redhat.com>
  • Loading branch information
@scottmarlow
scottmarlow committed Aug 28, 2024
1 parent 0e34103 commit 740a40c
Show file tree
Hide file tree
Showing 1,319 changed files with 11,445 additions and 13,812 deletions.
24 changes: 11 additions & 13 deletions ...tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagedTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
// Call the archive processor
archiveProcessor.processClientArchive(jpa_core_EntityGraph_appmanaged_vehicle_client, Client.class, resURL);

// Ejb
// Ejb 1
// the jar with the correct archive name
JavaArchive jpa_core_EntityGraph_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_appmanaged_vehicle_ejb.jar");
// The class files
Expand All @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class
);
// The ejb-jar.xml descriptor
URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml");
if(ejbResURL != null) {
jpa_core_EntityGraph_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml");
if(ejbResURL1 != null) {
jpa_core_EntityGraph_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
}
// The sun-ejb-jar.xml file
ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml");
if(ejbResURL != null) {
jpa_core_EntityGraph_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml");
if(ejbResURL1 != null) {
jpa_core_EntityGraph_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
}
// Call the archive processor
archiveProcessor.processEjbArchive(jpa_core_EntityGraph_appmanaged_vehicle_ejb, Client.class, ejbResURL);
archiveProcessor.processEjbArchive(jpa_core_EntityGraph_appmanaged_vehicle_ejb, Client.class, ejbResURL1);


// Par
// the jar with the correct archive name
Expand Down Expand Up @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test


// The application.xml descriptor
URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/");
if(earResURL != null) {
jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "application.xml");
}
URL earResURL = null;
// The sun-application.xml descriptor
earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/.ear.sun-application.xml");
earResURL = Client.class.getResource("/.ear.sun-application.xml");
if(earResURL != null) {
jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml");
}
Expand Down
24 changes: 11 additions & 13 deletions ...s/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagednotxTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
// Call the archive processor
archiveProcessor.processClientArchive(jpa_core_EntityGraph_appmanagedNoTx_vehicle_client, Client.class, resURL);

// Ejb
// Ejb 1
// the jar with the correct archive name
JavaArchive jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb.jar");
// The class files
Expand All @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class
);
// The ejb-jar.xml descriptor
URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml");
if(ejbResURL != null) {
jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml");
if(ejbResURL1 != null) {
jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
}
// The sun-ejb-jar.xml file
ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml");
if(ejbResURL != null) {
jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml");
if(ejbResURL1 != null) {
jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
}
// Call the archive processor
archiveProcessor.processEjbArchive(jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL);
archiveProcessor.processEjbArchive(jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb, Client.class, ejbResURL1);


// Par
// the jar with the correct archive name
Expand Down Expand Up @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test


// The application.xml descriptor
URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/");
if(earResURL != null) {
jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "application.xml");
}
URL earResURL = null;
// The sun-application.xml descriptor
earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/.ear.sun-application.xml");
earResURL = Client.class.getResource("/.ear.sun-application.xml");
if(earResURL != null) {
jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml");
}
Expand Down
8 changes: 3 additions & 5 deletions ...-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPmservletTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
// Call the archive processor
archiveProcessor.processWebArchive(jpa_core_EntityGraph_pmservlet_vehicle_web, Client.class, warResURL);


// Par
// the jar with the correct archive name
JavaArchive jpa_core_EntityGraph = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph.jar");
Expand Down Expand Up @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test


// The application.xml descriptor
URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/");
if(earResURL != null) {
jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "application.xml");
}
URL earResURL = null;
// The sun-application.xml descriptor
earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/.ear.sun-application.xml");
earResURL = Client.class.getResource("/.ear.sun-application.xml");
if(earResURL != null) {
jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml");
}
Expand Down
8 changes: 3 additions & 5 deletions ...-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPuservletTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
// Call the archive processor
archiveProcessor.processWebArchive(jpa_core_EntityGraph_puservlet_vehicle_web, Client.class, warResURL);


// Par
// the jar with the correct archive name
JavaArchive jpa_core_EntityGraph = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph.jar");
Expand Down Expand Up @@ -146,12 +147,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test


// The application.xml descriptor
URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/");
if(earResURL != null) {
jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "application.xml");
}
URL earResURL = null;
// The sun-application.xml descriptor
earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/.ear.sun-application.xml");
earResURL = Client.class.getResource("/.ear.sun-application.xml");
if(earResURL != null) {
jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml");
}
Expand Down
24 changes: 11 additions & 13 deletions ...-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateful3Test.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
// Call the archive processor
archiveProcessor.processClientArchive(jpa_core_EntityGraph_stateful3_vehicle_client, Client.class, resURL);

// Ejb
// Ejb 1
// the jar with the correct archive name
JavaArchive jpa_core_EntityGraph_stateful3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_stateful3_vehicle_ejb.jar");
// The class files
Expand All @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class
);
// The ejb-jar.xml descriptor
URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml");
if(ejbResURL != null) {
jpa_core_EntityGraph_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml");
if(ejbResURL1 != null) {
jpa_core_EntityGraph_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
}
// The sun-ejb-jar.xml file
ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml");
if(ejbResURL != null) {
jpa_core_EntityGraph_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml");
if(ejbResURL1 != null) {
jpa_core_EntityGraph_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
}
// Call the archive processor
archiveProcessor.processEjbArchive(jpa_core_EntityGraph_stateful3_vehicle_ejb, Client.class, ejbResURL);
archiveProcessor.processEjbArchive(jpa_core_EntityGraph_stateful3_vehicle_ejb, Client.class, ejbResURL1);


// Par
// the jar with the correct archive name
Expand Down Expand Up @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test


// The application.xml descriptor
URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/");
if(earResURL != null) {
jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "application.xml");
}
URL earResURL = null;
// The sun-application.xml descriptor
earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/.ear.sun-application.xml");
earResURL = Client.class.getResource("/.ear.sun-application.xml");
if(earResURL != null) {
jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml");
}
Expand Down
24 changes: 11 additions & 13 deletions ...tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateless3Test.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
// Call the archive processor
archiveProcessor.processClientArchive(jpa_core_EntityGraph_stateless3_vehicle_client, Client.class, resURL);

// Ejb
// Ejb 1
// the jar with the correct archive name
JavaArchive jpa_core_EntityGraph_stateless3_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_stateless3_vehicle_ejb.jar");
// The class files
Expand All @@ -124,17 +124,18 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class
);
// The ejb-jar.xml descriptor
URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml");
if(ejbResURL != null) {
jpa_core_EntityGraph_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml");
if(ejbResURL1 != null) {
jpa_core_EntityGraph_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
}
// The sun-ejb-jar.xml file
ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml");
if(ejbResURL != null) {
jpa_core_EntityGraph_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml");
if(ejbResURL1 != null) {
jpa_core_EntityGraph_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
}
// Call the archive processor
archiveProcessor.processEjbArchive(jpa_core_EntityGraph_stateless3_vehicle_ejb, Client.class, ejbResURL);
archiveProcessor.processEjbArchive(jpa_core_EntityGraph_stateless3_vehicle_ejb, Client.class, ejbResURL1);


// Par
// the jar with the correct archive name
Expand Down Expand Up @@ -173,12 +174,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test


// The application.xml descriptor
URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/");
if(earResURL != null) {
jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "application.xml");
}
URL earResURL = null;
// The sun-application.xml descriptor
earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/core/EntityGraph/.ear.sun-application.xml");
earResURL = Client.class.getResource("/.ear.sun-application.xml");
if(earResURL != null) {
jpa_core_EntityGraph_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml");
}
Expand Down
30 changes: 15 additions & 15 deletions ...main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagedTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class,
com.sun.ts.lib.harness.EETest.SetupException.class,
com.sun.ts.tests.common.vehicle.VehicleClient.class,
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class
);
// The application-client.xml descriptor
URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml");
Expand All @@ -99,7 +100,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
// Call the archive processor
archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_appmanaged_vehicle_client, Client1.class, resURL);

// Ejb
// Ejb 1
// the jar with the correct archive name
JavaArchive jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb.jar");
// The class files
Expand All @@ -121,20 +122,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1.class,
com.sun.ts.lib.harness.EETest.SetupException.class,
com.sun.ts.tests.common.vehicle.VehicleClient.class,
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class
com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class,
ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class
);
// The ejb-jar.xml descriptor
URL ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml");
if(ejbResURL != null) {
jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
URL ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml");
if(ejbResURL1 != null) {
jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
}
// The sun-ejb-jar.xml file
ejbResURL = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml");
if(ejbResURL != null) {
jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
ejbResURL1 = Client1.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml");
if(ejbResURL1 != null) {
jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
}
// Call the archive processor
archiveProcessor.processEjbArchive(jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb, Client1.class, ejbResURL);
archiveProcessor.processEjbArchive(jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb, Client1.class, ejbResURL1);


// Par
// the jar with the correct archive name
Expand Down Expand Up @@ -172,12 +175,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test


// The application.xml descriptor
URL earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/");
if(earResURL != null) {
jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "application.xml");
}
URL earResURL = null;
// The sun-application.xml descriptor
earResURL = Client1.class.getResource("/com/sun/ts/tests/jpa/core/StoredProcedureQuery/.ear.sun-application.xml");
earResURL = Client1.class.getResource("/.ear.sun-application.xml");
if(earResURL != null) {
jpa_core_StoredProcedureQuery_vehicles_ear.addAsManifestResource(earResURL, "sun-application.xml");
}
Expand Down
Loading

0 comments on commit 740a40c

Please sign in to comment.