From 083ea037856a477a637f6a20e907dcc05604f26d Mon Sep 17 00:00:00 2001 From: Alwin Joseph Date: Wed, 18 Sep 2024 16:39:40 +0530 Subject: [PATCH] 100/195 tests passing --- glassfish-runner/jta-platform-tck/pom.xml | 48 ++++---------- jta/pom.xml | 64 +------------------ .../transactional/ClientEjblitejspTest.java | 2 - .../ClientEjbliteservlet2Test.java | 17 +++-- .../ClientEjbliteservletTest.java | 7 +- .../begin/UserBeginClientJspTest.java | 38 +++-------- .../begin/UserBeginClientServletTest.java | 54 ++++++---------- .../commit/UserCommitClientJspTest.java | 19 ------ .../commit/UserCommitClientServletTest.java | 21 +----- .../ee/txpropagationtest/jsp_vehicle_web.xml | 2 +- .../txpropagationtest/servlet_vehicle_web.xml | 2 +- .../usertransaction/begin/jsp_vehicle_web.xml | 2 +- .../begin/servlet_vehicle_web.xml | 2 +- .../commit/jsp_vehicle_web.xml | 2 +- .../commit/servlet_vehicle_web.xml | 2 +- .../getstatus/jsp_vehicle_web.xml | 2 +- .../getstatus/servlet_vehicle_web.xml | 2 +- .../rollback/jsp_vehicle_web.xml | 2 +- .../rollback/servlet_vehicle_web.xml | 2 +- .../setrollbackonly/jsp_vehicle_web.xml | 2 +- .../setrollbackonly/servlet_vehicle_web.xml | 2 +- .../settransactiontimeout/jsp_vehicle_web.xml | 2 +- .../servlet_vehicle_web.xml | 2 +- 23 files changed, 65 insertions(+), 233 deletions(-) diff --git a/glassfish-runner/jta-platform-tck/pom.xml b/glassfish-runner/jta-platform-tck/pom.xml index 48970f8251..0afd045c15 100644 --- a/glassfish-runner/jta-platform-tck/pom.xml +++ b/glassfish-runner/jta-platform-tck/pom.xml @@ -86,7 +86,7 @@ cts1 cts1 11.0.0-SNAPSHOT - 1.0.0-M13 + 1.0.0-M15 @@ -115,20 +115,9 @@ ${junit.jupiter.version} - org.junit.jupiter - junit-jupiter-engine - test - - - junit - junit - 4.13.2 - test - - - org.hamcrest - hamcrest-core - 1.3 + org.junit.vintage + junit-vintage-engine + ${junit.jupiter.version} test @@ -242,22 +231,7 @@ tck-porting-lib ${version.jakarta.tck.arquillian} - - @@ -764,7 +738,6 @@ false - jta-tests-appclient @@ -772,11 +745,13 @@ verify - - ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/parsson.jar - tck-appclient + + + jakarta.tck:${tck.artifactId} ${project.build.directory}/${glassfish.toplevel.dir} @@ -820,10 +795,10 @@ com/sun/ts/tests/jta/ee/transactional/ClientEjbliteservletTest*.java com/sun/ts/tests/jta/ee/transactional/ClientEjbliteservlet2Test*.java com/sun/ts/tests/jta/ee/transactional/ClientEjblitejsfTest*.java - com/sun/ts/tests/jta/ee/txpropagationtest/ClientServletTest*.java + tck-javatest @@ -849,7 +824,6 @@ - diff --git a/jta/pom.xml b/jta/pom.xml index 38dee42d64..a124ef7d85 100644 --- a/jta/pom.xml +++ b/jta/pom.xml @@ -36,7 +36,7 @@ 1.9.1.Final 11.0.0-M2 5.10.2 - 1.0.0-M13 + 1.0.0-M16 @@ -48,24 +48,6 @@ pom import - @@ -127,7 +109,6 @@ tck-porting-lib ${version.jakarta.tck.arquillian} - org.junit.jupiter junit-jupiter @@ -146,52 +127,9 @@ org.jboss.arquillian.junit5 arquillian-junit5-core - - junit - junit - 4.13.2 - - - org.hamcrest - hamcrest-core - 1.3 - test - - - - - central - https://repo1.maven.org/maven2 - - - jboss - https://repository.jboss.org/nexus/content/repositories/releases/ - - - jakarta-snapshots - https://jakarta.oss.sonatype.org/content/repositories/staging/ - - - - - - diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/ClientEjblitejspTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/ClientEjblitejspTest.java index 47da942a78..077ba6b1d7 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/ClientEjblitejspTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/ClientEjblitejspTest.java @@ -95,8 +95,6 @@ public static void main(String[] args) { @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) public static WebArchive createDeploymentVehicle() { - // public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { - // War // the war with the correct archive name WebArchive transactional_ejblitejsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "transactional_ejblitejsp_vehicle_web.war"); diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/ClientEjbliteservlet2Test.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/ClientEjbliteservlet2Test.java index 79b2deb914..78d530cd9b 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/ClientEjbliteservlet2Test.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/ClientEjbliteservlet2Test.java @@ -52,7 +52,6 @@ public class ClientEjbliteservlet2Test extends EJBLiteClientBase { private static final Logger logger = System.getLogger(ClientEjbliteservlet2Test.class.getName()); - @BeforeEach void logStartTest(TestInfo testInfo) { logger.log(Logger.Level.INFO, "STARTING TEST : " + testInfo.getDisplayName()); @@ -68,6 +67,14 @@ public void cleanup() { logger.log(Logger.Level.INFO, "cleanup ok"); } + /* + * @class.setup_props: + * This is needed by the vehicle base classes + */ + public void setup(String[] args, Properties p) throws Exception { + + } + private static StringBuilder callRecords = new StringBuilder(); @Inject @@ -95,12 +102,9 @@ public static void main(String[] args) { @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) public static WebArchive createDeploymentVehicle() { - // public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { - // War // the war with the correct archive name WebArchive transactional_ejbliteservlet2_vehicle_web = ShrinkWrap.create(WebArchive.class, "transactional_ejbliteservlet2_vehicle_web.war"); - // The class files transactional_ejbliteservlet2_vehicle_web.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, @@ -110,7 +114,6 @@ public static WebArchive createDeploymentVehicle() { com.sun.ts.tests.ejb30.common.lite.NumberEnum.class, com.sun.ts.tests.ejb30.common.helper.Helper.class, com.sun.ts.tests.ejb30.common.lite.EJBLiteClientBase.class, - // com.sun.ts.tests.ejb30.common.lite.EJBLiteJsfClientBase.class, com.sun.ts.tests.ejb30.common.lite.NumberIF.class, com.sun.ts.lib.harness.EETest.Fault.class, com.sun.ts.lib.harness.EETest.class, @@ -124,8 +127,8 @@ public static WebArchive createDeploymentVehicle() { com.sun.ts.tests.jta.ee.transactional.Helper.class, com.sun.ts.tests.jta.ee.transactional.CTSDontRollbackException.class, com.sun.ts.tests.jta.ee.transactional.OneManagedBean.class, - EJBLiteServlet2Filter.class, - HttpServletDelegate.class, + com.sun.ts.tests.jta.ee.transactional.EJBLiteServlet2Filter.class, + com.sun.ts.tests.jta.ee.transactional.HttpServletDelegate.class, ClientEjbliteservlet2Test.class ); // The web.xml descriptor diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/ClientEjbliteservletTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/ClientEjbliteservletTest.java index 91e31a8970..5dc7e99623 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/ClientEjbliteservletTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/ClientEjbliteservletTest.java @@ -94,8 +94,6 @@ public static void main(String[] args) { @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) public static WebArchive createDeploymentVehicle() { - // public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { - // War // the war with the correct archive name WebArchive transactional_ejbliteservlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "transactional_ejbliteservlet_vehicle_web.war"); @@ -122,8 +120,8 @@ public static WebArchive createDeploymentVehicle() { com.sun.ts.tests.jta.ee.transactional.Helper.class, com.sun.ts.tests.jta.ee.transactional.CTSDontRollbackException.class, com.sun.ts.tests.jta.ee.transactional.OneManagedBean.class, - EJBLiteServletVehicle.class, - HttpServletDelegate.class, + com.sun.ts.tests.jta.ee.transactional.EJBLiteServletVehicle.class, + com.sun.ts.tests.jta.ee.transactional.HttpServletDelegate.class, ClientEjbliteservletTest.class ); // The web.xml descriptor @@ -137,7 +135,6 @@ public static WebArchive createDeploymentVehicle() { transactional_ejbliteservlet_vehicle_web.addAsWebInfResource(warResURL, "beans.xml"); } - return transactional_ejbliteservlet_vehicle_web; } diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClientJspTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClientJspTest.java index b7828178d2..1269e3ed35 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClientJspTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClientJspTest.java @@ -81,20 +81,17 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The class files begin_jsp_vehicle_web.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, - com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.jta.ee.usertransaction.begin.UserBeginClient.class, com.sun.ts.tests.jta.ee.common.Transact.class, com.sun.ts.tests.jta.ee.common.InvalidStatusException.class, com.sun.ts.tests.jta.ee.common.InitFailedException.class, com.sun.ts.tests.jta.ee.common.TransactionStatus.class, - com.sun.ts.tests.common.vehicle.VehicleRunnable.class, - com.sun.ts.tests.jta.ee.common.InvalidStatusException.class, - com.sun.ts.tests.jta.ee.common.InitFailedException.class, + com.sun.ts.lib.harness.EETest.Fault.class, com.sun.ts.lib.harness.EETest.class, com.sun.ts.lib.harness.ServiceEETest.class, - com.sun.ts.tests.jta.ee.common.TransactionStatus.class, com.sun.ts.lib.harness.EETest.SetupException.class, - com.sun.ts.tests.common.vehicle.VehicleClient.class, UserBeginClientJspTest.class ); // The web.xml descriptor @@ -109,36 +106,17 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test begin_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); // The sun-web.xml descriptor - warResURL = UserBeginClientJspTest.class.getClassLoader().getResource(packagePath+"/begin_jsp_vehicle_web.war.sun-web.xml"); - if(warResURL != null) { - begin_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); - } + // warResURL = UserBeginClientJspTest.class.getClassLoader().getResource(packagePath+"/begin_jsp_vehicle_web.war.sun-web.xml"); + // if(warResURL != null) { + // begin_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + // } - archiveProcessor.processWebArchive(begin_jsp_vehicle_web, UserBeginClientJspTest.class, warResURL); + // archiveProcessor.processWebArchive(begin_jsp_vehicle_web, UserBeginClientJspTest.class, warResURL); // Ear EnterpriseArchive begin_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "begin_jsp_vehicle.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target begin_jsp_vehicle_ear.addAsModule(begin_jsp_vehicle_web); - - - - // // The application.xml descriptor - // URL earResURL = UserBeginClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/begin/"); - // if(earResURL != null) { - // begin_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - // } - // // The sun-application.xml descriptor - // earResURL = UserBeginClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/begin/.ear.sun-application.xml"); - // if(earResURL != null) { - // begin_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); - // } - // archiveProcessor.processEarArchive(begin_jsp_vehicle_ear, UserBeginClient.class, earResURL); - return begin_jsp_vehicle_ear; } diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClientServletTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClientServletTest.java index b41e8ca516..5dc77be1d7 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClientServletTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClientServletTest.java @@ -80,23 +80,23 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test WebArchive begin_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "begin_servlet_vehicle_web.war"); // The class files begin_servlet_vehicle_web.addClasses( - com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, - com.sun.ts.lib.harness.EETest.Fault.class, - com.sun.ts.tests.jta.ee.usertransaction.begin.UserBeginClient.class, - com.sun.ts.tests.jta.ee.common.Transact.class, - com.sun.ts.tests.jta.ee.common.InvalidStatusException.class, - com.sun.ts.tests.jta.ee.common.InitFailedException.class, - com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, - com.sun.ts.tests.jta.ee.common.TransactionStatus.class, - com.sun.ts.tests.common.vehicle.VehicleRunnable.class, - com.sun.ts.tests.jta.ee.common.InvalidStatusException.class, - com.sun.ts.tests.jta.ee.common.InitFailedException.class, - com.sun.ts.lib.harness.EETest.class, - com.sun.ts.lib.harness.ServiceEETest.class, - com.sun.ts.tests.jta.ee.common.TransactionStatus.class, - com.sun.ts.lib.harness.EETest.SetupException.class, - com.sun.ts.tests.common.vehicle.VehicleClient.class, - UserBeginClientServletTest.class + com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, + com.sun.ts.lib.harness.EETest.Fault.class, + com.sun.ts.tests.jta.ee.common.Transact.class, + com.sun.ts.tests.jta.ee.common.InvalidStatusException.class, + com.sun.ts.tests.jta.ee.common.InitFailedException.class, + com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, + com.sun.ts.tests.jta.ee.common.TransactionStatus.class, + com.sun.ts.tests.jta.ee.usertransaction.begin.UserBeginClient.class, + com.sun.ts.tests.common.vehicle.VehicleRunnable.class, + com.sun.ts.tests.jta.ee.common.InvalidStatusException.class, + com.sun.ts.tests.jta.ee.common.InitFailedException.class, + com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.ServiceEETest.class, + com.sun.ts.tests.jta.ee.common.TransactionStatus.class, + com.sun.ts.lib.harness.EETest.SetupException.class, + com.sun.ts.tests.common.vehicle.VehicleClient.class, + UserBeginClientServletTest.class ); // The web.xml descriptor URL warResURL = UserBeginClientServletTest.class.getClassLoader().getResource(packagePath+"/servlet_vehicle_web.xml"); @@ -113,25 +113,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Ear EnterpriseArchive begin_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "begin_servlet_vehicle.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - begin_servlet_vehicle_ear.addAsModule(begin_servlet_vehicle_web); - - - // // The application.xml descriptor - // URL earResURL = UserBeginClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/begin/"); - // if(earResURL != null) { - // begin_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - // } - // // The sun-application.xml descriptor - // earResURL = UserBeginClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/begin/.ear.sun-application.xml"); - // if(earResURL != null) { - // begin_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); - // } - // archiveProcessor.processEarArchive(begin_servlet_vehicle_ear, UserBeginClient.class, earResURL); - + begin_servlet_vehicle_ear.addAsModule(begin_servlet_vehicle_web); return begin_servlet_vehicle_ear; } diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/UserCommitClientJspTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/UserCommitClientJspTest.java index 43505eb968..2b1bf52669 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/UserCommitClientJspTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/UserCommitClientJspTest.java @@ -118,26 +118,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Ear EnterpriseArchive commit_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "commit_jsp_vehicle.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target commit_jsp_vehicle_ear.addAsModule(commit_jsp_vehicle_web); - - - - // // The application.xml descriptor - // URL earResURL = UserCommitClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/commit/"); - // if(earResURL != null) { - // commit_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - // } - // // The sun-application.xml descriptor - // earResURL = UserCommitClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/commit/.ear.sun-application.xml"); - // if(earResURL != null) { - // commit_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); - // } - // archiveProcessor.processEarArchive(commit_jsp_vehicle_ear, UserCommitClient.class, earResURL); - return commit_jsp_vehicle_ear; } diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/UserCommitClientServletTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/UserCommitClientServletTest.java index 63ed893569..58f71922d3 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/UserCommitClientServletTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/UserCommitClientServletTest.java @@ -113,26 +113,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Ear EnterpriseArchive commit_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "commit_servlet_vehicle.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - commit_servlet_vehicle_ear.addAsModule(commit_servlet_vehicle_web); - - - - // // The application.xml descriptor - // URL earResURL = UserCommitClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/commit/"); - // if(earResURL != null) { - // commit_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - // } - // // The sun-application.xml descriptor - // earResURL = UserCommitClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/commit/.ear.sun-application.xml"); - // if(earResURL != null) { - // commit_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); - // } - // archiveProcessor.processEarArchive(commit_servlet_vehicle_ear, UserCommitClient.class, earResURL); - + commit_servlet_vehicle_ear.addAsModule(commit_servlet_vehicle_web); return commit_servlet_vehicle_ear; } diff --git a/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jsp_vehicle_web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jsp_vehicle_web.xml index 73341d1759..5743a8047b 100644 --- a/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jsp_vehicle_web.xml +++ b/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jsp_vehicle_web.xml @@ -18,7 +18,7 @@ --> - jsp_vehicle + txpropagationtest_jsp_vehicle jsp_vehicle /jsp_vehicle.jsp diff --git a/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/servlet_vehicle_web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/servlet_vehicle_web.xml index 626466c5c0..512ea988e7 100644 --- a/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/servlet_vehicle_web.xml +++ b/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/servlet_vehicle_web.xml @@ -18,7 +18,7 @@ --> - servlet_vehicle + txpropagationtest_servlet_vehicle Servlet_VehicleLogicalName com.sun.ts.tests.common.vehicle.servlet.ServletVehicle diff --git a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/begin/jsp_vehicle_web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/begin/jsp_vehicle_web.xml index af54232b7e..165f9aaa5e 100644 --- a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/begin/jsp_vehicle_web.xml +++ b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/begin/jsp_vehicle_web.xml @@ -18,7 +18,7 @@ --> - jsp_vehicle + begin_jsp_vehicle jsp_vehicle /jsp_vehicle.jsp diff --git a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/begin/servlet_vehicle_web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/begin/servlet_vehicle_web.xml index e6178bc18a..72589156e0 100644 --- a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/begin/servlet_vehicle_web.xml +++ b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/begin/servlet_vehicle_web.xml @@ -18,7 +18,7 @@ --> - servlet_vehicle + begin_servlet_vehicle Servlet_VehicleLogicalName com.sun.ts.tests.common.vehicle.servlet.ServletVehicle diff --git a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/jsp_vehicle_web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/jsp_vehicle_web.xml index af54232b7e..727d696ed4 100644 --- a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/jsp_vehicle_web.xml +++ b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/jsp_vehicle_web.xml @@ -18,7 +18,7 @@ --> - jsp_vehicle + commit_jsp_vehicle jsp_vehicle /jsp_vehicle.jsp diff --git a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/servlet_vehicle_web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/servlet_vehicle_web.xml index e6178bc18a..59939e89ad 100644 --- a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/servlet_vehicle_web.xml +++ b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/servlet_vehicle_web.xml @@ -18,7 +18,7 @@ --> - servlet_vehicle + commit_servlet_vehicle Servlet_VehicleLogicalName com.sun.ts.tests.common.vehicle.servlet.ServletVehicle diff --git a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/jsp_vehicle_web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/jsp_vehicle_web.xml index af54232b7e..820b75975b 100644 --- a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/jsp_vehicle_web.xml +++ b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/jsp_vehicle_web.xml @@ -18,7 +18,7 @@ --> - jsp_vehicle + getstatus_jsp_vehicle jsp_vehicle /jsp_vehicle.jsp diff --git a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/servlet_vehicle_web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/servlet_vehicle_web.xml index e6178bc18a..f27ab61ec8 100644 --- a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/servlet_vehicle_web.xml +++ b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/servlet_vehicle_web.xml @@ -18,7 +18,7 @@ --> - servlet_vehicle + getstatus_servlet_vehicle Servlet_VehicleLogicalName com.sun.ts.tests.common.vehicle.servlet.ServletVehicle diff --git a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/jsp_vehicle_web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/jsp_vehicle_web.xml index af54232b7e..69de9f6a2c 100644 --- a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/jsp_vehicle_web.xml +++ b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/jsp_vehicle_web.xml @@ -18,7 +18,7 @@ --> - jsp_vehicle + rollback_jsp_vehicle jsp_vehicle /jsp_vehicle.jsp diff --git a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/servlet_vehicle_web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/servlet_vehicle_web.xml index e6178bc18a..ecacfd9d24 100644 --- a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/servlet_vehicle_web.xml +++ b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/servlet_vehicle_web.xml @@ -18,7 +18,7 @@ --> - servlet_vehicle + rollback_servlet_vehicle Servlet_VehicleLogicalName com.sun.ts.tests.common.vehicle.servlet.ServletVehicle diff --git a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/jsp_vehicle_web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/jsp_vehicle_web.xml index af54232b7e..fb5231e841 100644 --- a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/jsp_vehicle_web.xml +++ b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/jsp_vehicle_web.xml @@ -18,7 +18,7 @@ --> - jsp_vehicle + setrollbackonly_jsp_vehicle jsp_vehicle /jsp_vehicle.jsp diff --git a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/servlet_vehicle_web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/servlet_vehicle_web.xml index e6178bc18a..bfa2471f94 100644 --- a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/servlet_vehicle_web.xml +++ b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/servlet_vehicle_web.xml @@ -18,7 +18,7 @@ --> - servlet_vehicle + setrollbackonly_servlet_vehicle Servlet_VehicleLogicalName com.sun.ts.tests.common.vehicle.servlet.ServletVehicle diff --git a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/jsp_vehicle_web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/jsp_vehicle_web.xml index af54232b7e..d0c57baa30 100644 --- a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/jsp_vehicle_web.xml +++ b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/jsp_vehicle_web.xml @@ -18,7 +18,7 @@ --> - jsp_vehicle + settransactiontimeout_jsp_vehicle jsp_vehicle /jsp_vehicle.jsp diff --git a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/servlet_vehicle_web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/servlet_vehicle_web.xml index e6178bc18a..2f36ccd6be 100644 --- a/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/servlet_vehicle_web.xml +++ b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/servlet_vehicle_web.xml @@ -18,7 +18,7 @@ --> - servlet_vehicle + settransactiontimeout_servlet_vehicle Servlet_VehicleLogicalName com.sun.ts.tests.common.vehicle.servlet.ServletVehicle