From 2dc894cae9c7d735090dd60f61780e6e142bdacc Mon Sep 17 00:00:00 2001 From: Scott Marlow Date: Thu, 21 Nov 2024 13:12:22 -0500 Subject: [PATCH 1/2] Correct Order class reference in ee.jakarta.tck.persistence.ee.entityManagerFactory.ClientPmservletTest test Signed-off-by: Scott Marlow --- .../ee/entityManagerFactory/ClientPmservletTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientPmservletTest.java index dd64378359..eb62cb33e4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientPmservletTest.java @@ -116,9 +116,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // the jar with the correct archive name JavaArchive jpa_ee_entityManagerFactory = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory.jar"); // The class files - jpa_ee_entityManagerFactory.addClasses( - Util.getSchema30classes() - ).addClass(Order.class); + jpa_ee_entityManagerFactory.addClasses(Order.class); // The persistence.xml descriptor URL parURL = Client.class.getResource("persistence.xml"); if(parURL != null) { From 75595ff8f04ac41244ec82ff21d03c0ca42a98d2 Mon Sep 17 00:00:00 2001 From: Scott Marlow Date: Fri, 22 Nov 2024 14:29:49 -0500 Subject: [PATCH 2/2] work in progress changes for persistence/ee/pluggability/contracts/jta/ClientPmservletTest (now failing with CNFE on alternate persistence provider class) Signed-off-by: Scott Marlow --- .../jakartaeetck/bin/ts.jte | 2 +- .../pluggability/util/LogFileProcessor.java | 111 +++++++++--------- .../contracts/jta/ClientPmservletTest.java | 85 ++++++++------ 3 files changed, 101 insertions(+), 97 deletions(-) diff --git a/glassfish-runner/persistence-platform-tck/jakartaeetck/bin/ts.jte b/glassfish-runner/persistence-platform-tck/jakartaeetck/bin/ts.jte index 4794227579..676e5b9057 100644 --- a/glassfish-runner/persistence-platform-tck/jakartaeetck/bin/ts.jte +++ b/glassfish-runner/persistence-platform-tck/jakartaeetck/bin/ts.jte @@ -359,7 +359,7 @@ vi.domain=${vi.domain.dir}/${vi.domain.name} vi.asenv.loc=${javaee.home}/config vi.imqbin.loc=${javaee.home}/../mq/bin vi.lib=${javaee.home}/server/lib -vi.log.file.location=${vi.domain}/logs +vi.log.file.location=/tmp vi.modules=${javaee.home}/modules vi.imq.share.lib=${javaee.home}/../mq/lib vi.jvm.options=-Doracle.jdbc.J2EE13Compliant=true:-Xmx4096m:-Dj2eelogin.name=${user}:-Dj2eelogin.password=${password}:-Deislogin.name=${user1}:-Deislogin.password=${password1}:-Dtest.ejb.stateful.timeout.wait.seconds=${test.ejb.stateful.timeout.wait.seconds}:-DwebServerPort.2=${webServerPort.2}:-DwebServerHost.2=${webServerHost.2}:-Dcsiv2.save.log.file=${harness.log.traceflag}:-Djavax.xml.accessExternalStylesheet=all:-Djavax.xml.accessExternalDTD=file,http diff --git a/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/pluggability/util/LogFileProcessor.java b/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/pluggability/util/LogFileProcessor.java index a41ea53785..2ac102c448 100644 --- a/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/pluggability/util/LogFileProcessor.java +++ b/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/pluggability/util/LogFileProcessor.java @@ -22,7 +22,6 @@ import java.io.FileInputStream; import java.io.FileWriter; import java.io.SequenceInputStream; -import java.lang.System.Logger; import java.util.Collection; import java.util.Iterator; import java.util.Properties; @@ -32,6 +31,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import com.sun.ts.lib.util.TestUtil; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -64,8 +64,6 @@ public class LogFileProcessor { private Collection appSpecificRecordCollection = null; - private static final Logger logger = (Logger) System.getLogger(LogFileProcessor.class.getName()); - public LogFileProcessor(Properties props) { setup(props); } @@ -77,14 +75,14 @@ public void setup(Properties props) { logFileLocation = props.getProperty("log.file.location"); if (logFileLocation == null) { - logger.log(Logger.Level.ERROR, "LogFileProcessor setup failed "); - logger.log(Logger.Level.ERROR, "Please verify that the property log.file.location exists in ts.jte"); + TestUtil.logErr("LogFileProcessor setup failed "); + TestUtil.logErr("Please verify that the property log.file.location exists in ts.jte"); throw new IllegalArgumentException("Configure log.file.location in your ts.jte"); } else { - logger.log(Logger.Level.INFO, "log.file.location = " + logFileLocation); + TestUtil.logMsg("log.file.location = " + logFileLocation); } logFileLocation = getLogFileName(logFileLocation); - logger.log(Logger.Level.TRACE, "LogFileProcessor setup finished"); + TestUtil.logTrace("LogFileProcessor setup finished"); } /** @@ -94,9 +92,9 @@ public void setup(Properties props) { public long getCurrentSequenceNumber() { LogRecordEntry recordEntry = null; long seqNum = 0L; - logger.log(Logger.Level.TRACE, "Searching for current Sequence Number"); + TestUtil.logTrace("Searching for current Sequence Number"); if (recordCollection != null) { - logger.log(Logger.Level.TRACE, "Record collection has: " + recordCollection.size() + " records."); + TestUtil.logTrace("Record collection has: " + recordCollection.size() + " records."); for (Iterator iterator = recordCollection.iterator(); iterator.hasNext();) { // loop thru all message tag/entries in the log file searching for last // sequence number @@ -105,7 +103,7 @@ public long getCurrentSequenceNumber() { // logger.log(Logger.Level.TRACE,"seq:" + seqNum); } } else { - logger.log(Logger.Level.ERROR, "Record collection empty : No log records found"); + TestUtil.logErr("Record collection empty : No log records found"); } // System.out.println("final number:" + seqNum); return seqNum; @@ -122,9 +120,9 @@ public void purgeLog() { logfile = new File(logFileLocation); if (logFileLocation == null || !logfile.exists()) { - logger.log(Logger.Level.ERROR, "Log File : " + logFileLocation + " does not exists"); + TestUtil.logErr("Log File : " + logFileLocation + " does not exists"); } else { - logger.log(Logger.Level.TRACE, "Purging log file : " + logFileLocation); + TestUtil.logTrace("Purging log file : " + logFileLocation); BufferedWriter writer = new BufferedWriter(new FileWriter(logFileLocation)); writer.newLine(); @@ -132,7 +130,7 @@ public void purgeLog() { } } catch (Exception e) { - logger.log(Logger.Level.ERROR, "Exception occurred while purging log:" + e); + TestUtil.logErr("Exception occurred while purging log:" + e); } } @@ -151,9 +149,9 @@ public boolean fetchLog() { logfile = new File(logFileLocation); if (logFileLocation == null || !logfile.exists()) { - logger.log(Logger.Level.ERROR, "Log File : " + logFileLocation + " does not exists"); - logger.log(Logger.Level.ERROR, "Check permissions for log file "); - logger.log(Logger.Level.ERROR, "See User guide for Configuring log file permissions"); + TestUtil.logErr("Log File : " + logFileLocation + " does not exists"); + TestUtil.logErr("Check permissions for log file "); + TestUtil.logErr("See User guide for Configuring log file permissions"); } else { // LogRecords will be added to JPALog.txt as long as the server is // up and running. Since JPALog.txt is continuously updated with @@ -170,7 +168,7 @@ public boolean fetchLog() { // FileInputStream and a ByteArrayInputStream, where the // ByteArrayInputStream contains the bytes for // - logger.log(Logger.Level.TRACE, "Log File : " + logfile.getAbsolutePath()); + TestUtil.logTrace("Log File : " + logfile.getAbsolutePath()); String endLogTag = ""; ByteArrayInputStream bais = new ByteArrayInputStream(endLogTag.getBytes()); @@ -189,7 +187,7 @@ public boolean fetchLog() { } } catch (Exception e) { - logger.log(Logger.Level.ERROR, "Exception occurred while fetching log:" + e); + TestUtil.logErr("Exception occurred while fetching log:" + e); } return logRetrieved; } @@ -266,15 +264,15 @@ public boolean verifyLogContains(String args[]) { */ public boolean verifyLogContains(String args[], long sequenceNum) { LogRecordEntry recordEntry = null; - logger.log(Logger.Level.TRACE, "Searching log records for the following:"); + TestUtil.logTrace("Searching log records for the following:"); for (String s : args) { - logger.log(Logger.Level.TRACE, "item:" + s); + TestUtil.logTrace("item:" + s); } if (recordCollection == null) { - logger.log(Logger.Level.TRACE, "Record collection empty : No log records found"); + TestUtil.logTrace("Record collection empty : No log records found"); return false; } else { - logger.log(Logger.Level.TRACE, "Record collection has: " + recordCollection.size() + " records."); + TestUtil.logTrace("Record collection has: " + recordCollection.size() + " records."); } int numberOfArgs = args.length; @@ -316,9 +314,8 @@ public boolean verifyLogContains(String args[], long sequenceNum) { // see if one of the search argument matches with // the logfile message entry and if so return true if ((message != null) && message.equals(args[i])) { - logger.log(Logger.Level.TRACE, "Matching Record :"); - logger.log(Logger.Level.TRACE, - recordEntry.getSequenceNumber() + ":" + recordEntry.getMessage()); + TestUtil.logTrace("Matching Record :"); + TestUtil.logTrace(recordEntry.getSequenceNumber() + ":" + recordEntry.getMessage()); // Increment match count numberOfMatches++; @@ -343,10 +340,10 @@ public boolean verifyLogContains(String args[], long sequenceNum) { } // Print unmatched Strings(i.e no matches were found for these strings) - logger.log(Logger.Level.TRACE, "No Matching log Record(s) found for the following String(s) :"); + TestUtil.logTrace("No Matching log Record(s) found for the following String(s) :"); for (int i = 0; i < numberOfArgs; i++) { if (argsMatchIndex[i] == false) { - logger.log(Logger.Level.TRACE, args[i]); + TestUtil.logTrace(args[i]); } } @@ -372,15 +369,15 @@ public boolean verifyLogContainsOneOf(String args[]) { LogRecordEntry recordEntry = null; boolean result = false; - logger.log(Logger.Level.TRACE, "Searching log records for one of the following:"); + TestUtil.logTrace("Searching log records for one of the following:"); for (String s : args) { - logger.log(Logger.Level.TRACE, "item:" + s); + TestUtil.logTrace("item:" + s); } if (recordCollection == null) { - logger.log(Logger.Level.TRACE, "Record collection empty : No log records found"); + TestUtil.logTrace("Record collection empty : No log records found"); return false; } else { - logger.log(Logger.Level.TRACE, "Record collection has: " + recordCollection.size() + " records."); + TestUtil.logTrace("Record collection has: " + recordCollection.size() + " records."); } int numberOfArgs = args.length; @@ -396,8 +393,8 @@ public boolean verifyLogContainsOneOf(String args[]) { // see if one of the search argument matches with // the logfile message entry and if so return true if ((message != null) && message.equals(args[i])) { - logger.log(Logger.Level.TRACE, "Matching Record :"); - logger.log(Logger.Level.TRACE, recordEntry.getSequenceNumber() + ":" + recordEntry.getMessage()); + TestUtil.logTrace("Matching Record :"); + TestUtil.logTrace(recordEntry.getSequenceNumber() + ":" + recordEntry.getMessage()); result = true; // If a match is found no need to search further @@ -409,9 +406,9 @@ public boolean verifyLogContainsOneOf(String args[]) { if (!result) { // Print unmatched Strings(i.e no matches were found for these strings) - logger.log(Logger.Level.TRACE, "No Matching log Record(s) found for the following String(s) :"); + TestUtil.logTrace("No Matching log Record(s) found for the following String(s) :"); for (int i = 0; i < numberOfArgs; i++) { - logger.log(Logger.Level.TRACE, args[i]); + TestUtil.logTrace(args[i]); } } @@ -446,13 +443,13 @@ public boolean verifyLogContainsOneOfSubString(String args[], String srchStrPref LogRecordEntry recordEntry = null; boolean result = false; - logger.log(Logger.Level.TRACE, + TestUtil.logTrace( "Searching log records for the presence of one of the String" + " from a given string array"); if (recordCollection == null) { - logger.log(Logger.Level.TRACE, "Record collection empty : No log records found"); + TestUtil.logTrace("Record collection empty : No log records found"); return false; } else { - logger.log(Logger.Level.TRACE, "Record collection has: " + recordCollection.size() + " records."); + TestUtil.logTrace("Record collection has: " + recordCollection.size() + " records."); } int numberOfArgs = args.length; @@ -468,8 +465,8 @@ public boolean verifyLogContainsOneOfSubString(String args[], String srchStrPref // see if one of the search argument matches with // the logfile message entry and if so return true if ((message != null) && (message.startsWith(srchStrPrefix, 0)) && (message.indexOf(args[i]) > 0)) { - logger.log(Logger.Level.TRACE, "Matching Record :"); - logger.log(Logger.Level.TRACE, recordEntry.getMessage()); + TestUtil.logTrace("Matching Record :"); + TestUtil.logTrace(recordEntry.getMessage()); result = true; // If a match is found no need to search further @@ -481,9 +478,9 @@ public boolean verifyLogContainsOneOfSubString(String args[], String srchStrPref if (!result) { // Print unmatched Strings(i.e no matches were found for these strings) - logger.log(Logger.Level.TRACE, "No Matching log Record(s) found for the following String(s) :"); + TestUtil.logTrace("No Matching log Record(s) found for the following String(s) :"); for (int i = 0; i < numberOfArgs; i++) { - logger.log(Logger.Level.TRACE, args[i]); + TestUtil.logTrace(args[i]); } } @@ -501,20 +498,20 @@ public void printCollection(Collection recordCollection) { } public void printRecordEntry(LogRecordEntry rec) { - logger.log(Logger.Level.TRACE, "*******Log Content*******"); + TestUtil.logTrace("*******Log Content*******"); - logger.log(Logger.Level.TRACE, "Milli Seconds =" + rec.getMilliSeconds()); - logger.log(Logger.Level.TRACE, "Seqence no =" + rec.getSequenceNumber()); - logger.log(Logger.Level.TRACE, "Message =" + rec.getMessage()); + TestUtil.logTrace("Milli Seconds =" + rec.getMilliSeconds()); + TestUtil.logTrace("Seqence no =" + rec.getSequenceNumber()); + TestUtil.logTrace("Message =" + rec.getMessage()); if (rec.getClassName() != null) - logger.log(Logger.Level.TRACE, "Class name =" + rec.getClassName()); + TestUtil.logTrace("Class name =" + rec.getClassName()); if (rec.getMethodName() != null) - logger.log(Logger.Level.TRACE, "Method name =" + rec.getMethodName()); + TestUtil.logTrace("Method name =" + rec.getMethodName()); if (rec.getLevel() != null) - logger.log(Logger.Level.TRACE, "Level =" + rec.getLevel()); + TestUtil.logTrace("Level =" + rec.getLevel()); if (rec.getThrown() != null) - logger.log(Logger.Level.TRACE, "Thrown =" + rec.getThrown()); - logger.log(Logger.Level.TRACE, ""); + TestUtil.logTrace("Thrown =" + rec.getThrown()); + TestUtil.logTrace(""); } public String extractQueryToken(String str, String ContextId) { @@ -622,10 +619,10 @@ public String getLogFileName(String logFileLocation) { int lastFileIndex = 0; File dir = new File(logFileLocation); if (dir.exists()) { - logger.log(Logger.Level.TRACE, "log file location exists:" + logFileLocation); + TestUtil.logTrace("log file location exists:" + logFileLocation); String[] chld = dir.list(); if (chld == null) { - logger.log(Logger.Level.ERROR, + TestUtil.logErr( "Appserver log directory does not exist or is not a directory, using default log file location."); } else { boolean found = false; @@ -642,19 +639,19 @@ public String getLogFileName(String logFileLocation) { } } logName = logFileLocation + File.separator + lastFileName; - logger.log(Logger.Level.INFO, "Found log file:" + logName); + TestUtil.logMsg("Found log file:" + logName); found = true; // break; } else { - logger.log(Logger.Level.TRACE, "Ignoring file:" + fName); + TestUtil.logTrace("Ignoring file:" + fName); } } if (!found) { - logger.log(Logger.Level.INFO, "Log file not found, using default location:" + logName); + TestUtil.logMsg("Log file not found, using default location:" + logName); } } } else { - logger.log(Logger.Level.ERROR, "Log file location DOES NOT exist, using default location:" + logName); + TestUtil.logErr("Log file location DOES NOT exist, using default location:" + logName); } return logName; diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/ClientPmservletTest.java index bba8984292..16859b9418 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/ClientPmservletTest.java @@ -77,53 +77,64 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); + // Par + // the jar with the correct archive name + JavaArchive jpa_ee_pluggability_contracts_jta = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta.jar"); + // The class files + jpa_ee_pluggability_contracts_jta.addClasses( + ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order3.class, + ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order2.class, + ee.jakarta.tck.persistence.common.pluggability.util.LogRecordEntry.class, + ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order.class, + ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order4.class, + ee.jakarta.tck.persistence.common.pluggability.util.LogFileProcessor.class + ); + // The persistence.xml descriptor + URL parURL = Client.class.getResource("persistence.xml"); + if(parURL != null) { + jpa_ee_pluggability_contracts_jta.addAsManifestResource(parURL, "persistence.xml"); + } + // Call the archive processor + archiveProcessor.processParArchive(jpa_ee_pluggability_contracts_jta, Client.class, parURL); + // The orm.xml file + parURL = Client.class.getResource("orm.xml"); + if(parURL != null) { + jpa_ee_pluggability_contracts_jta.addAsManifestResource(parURL, "orm.xml"); + } + JavaArchive jpa_alternate_provider = ShrinkWrap.create(JavaArchive.class,"jpa_alternate_provider.jar"); + jpa_alternate_provider.addClasses( + ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.CacheImpl.class, + ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.ClassTransformerImpl.class, + ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityManagerFactoryImpl.class, + ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityManagerImpl.class, + ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityTransactionImpl.class, + ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceProvider.class, + ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceUnitInfoImpl.class, + ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.QueryImpl.class, + ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSLogger.class, + ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSLogRecord.class, + ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSXMLFormatter.class + ).addAsResource( + new StringAsset("ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceProvider"), + "META-INF/services/jakarta.persistence.spi.PersistenceProvider"); + // Add the WAR libraries (alternative Persistence Provider and Persistence archive) + jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web.addAsLibraries(jpa_alternate_provider, jpa_ee_pluggability_contracts_jta); + // The web.xml descriptor - URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); - if(warResURL != null) { - jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); - } // The sun-web.xml descriptor - warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + + URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } - // Web content - warResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/pluggability/contracts/jta/jpa_ee_pluggability_contracts_jta.jar"); - if(warResURL != null) { - jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/lib/jpa_ee_pluggability_contracts_jta.jar"); - } warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); if(warResURL != null) { - jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web.addAsWebResource(warResURL, "/WEB-INF/pmservlet_vehicle_web.xml"); + jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // Call the archive processor archiveProcessor.processWebArchive(jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web, Client.class, warResURL); - // Par - // the jar with the correct archive name - JavaArchive jpa_ee_pluggability_contracts_jta = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta.jar"); - // The class files - jpa_ee_pluggability_contracts_jta.addClasses( - ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order3.class, - ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order2.class, - ee.jakarta.tck.persistence.common.pluggability.util.LogRecordEntry.class, - ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order.class, - ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order4.class, - ee.jakarta.tck.persistence.common.pluggability.util.LogFileProcessor.class - ); - // The persistence.xml descriptor - URL parURL = Client.class.getResource("persistence.xml"); - if(parURL != null) { - jpa_ee_pluggability_contracts_jta.addAsManifestResource(parURL, "persistence.xml"); - } - // Call the archive processor - archiveProcessor.processParArchive(jpa_ee_pluggability_contracts_jta, Client.class, parURL); - // The orm.xml file - parURL = Client.class.getResource("orm.xml"); - if(parURL != null) { - jpa_ee_pluggability_contracts_jta.addAsManifestResource(parURL, "orm.xml"); - } // Ear EnterpriseArchive jpa_ee_pluggability_contracts_jta_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_pluggability_contracts_jta_vehicles.ear"); @@ -133,10 +144,6 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The component jars built by the package target jpa_ee_pluggability_contracts_jta_vehicles_ear.addAsModule(jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web); - jpa_ee_pluggability_contracts_jta_vehicles_ear.addAsLibrary(jpa_ee_pluggability_contracts_jta); - - - // The application.xml descriptor URL earResURL = Client.class.getResource("/com/sun/ts/tests/jpa/ee/pluggability/contracts/jta/"); if(earResURL != null) {