priorityList,
+ String txType) throws Exception {
+ String result = null;
+ if (priorityList.contains(Interceptor.Priority.PLATFORM_BEFORE + 200)) {
+ Helper.getLogger().log(Level.INFO, "Transactional Interceptor for "
+ + txType + " has right interceptor priority");
+ result = "Transactional Interceptor for " + txType
+ + " has right interceptor priority";
+ } else {
+ throw new Exception("Transactional Interceptor for " + txType
+ + " has incorrect interceptor priority : "
+ + Arrays.toString(priorityList.toArray()) + " Excpected value is :"
+ + Interceptor.Priority.PLATFORM_BEFORE + 200);
+ }
+
+ if (result != null)
+ appendReason(result);
+
+ }
+
+}
\ No newline at end of file
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/EJBLiteJSPTag.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/EJBLiteJSPTag.java
new file mode 100644
index 0000000000..c97afe9503
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/EJBLiteJSPTag.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+
+package com.sun.ts.tests.jta.ee.transactional;
+
+import jakarta.servlet.jsp.JspContext;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.JspFragment;
+import jakarta.servlet.jsp.tagext.JspTag;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.SimpleTag;
+import java.io.IOException;
+
+public class EJBLiteJSPTag extends ClientEjblitejspTest implements SimpleTag {
+ /** Reference to the enclosing tag. */
+ private JspTag parentTag;
+
+ /** The JSP context for the upcoming tag invocation. */
+ private JspContext jspContext;
+
+ /** The body of the tag. */
+ private JspFragment jspBody;
+
+ /**
+ * Called by the container to invoke this tag.
+ * The implementation of this method is provided by the tag library developer,
+ * and handles all tag processing, body iteration, etc.
+ */
+ public void doTag() throws JspException {
+ JspWriter out = getJspContext().getOut();
+ setModuleName(
+ ((PageContext) getJspContext()).getServletContext().getContextPath() );
+ String sta = getStatus(); //to trigger the test run
+ getJspContext().setAttribute("statusAndReason", sta + " " + getReason());
+ JspFragment f = getJspBody();
+ if (f != null) {
+ try {
+ f.invoke(out);
+ } catch (IOException e) {
+ throw new JspException(e);
+ }
+ }
+ }
+
+ /**
+ * Sets the parent of this tag, for collaboration purposes.
+ *
+ * The container invokes this method only if this tag invocation is
+ * nested within another tag invocation.
+ *
+ * @param parent the tag that encloses this tag
+ */
+ public void setParent(JspTag parent) {
+ this.parentTag = parent;
+ }
+
+ /**
+ * Returns the parent of this tag, for collaboration purposes.
+ *
+ * @return the parent of this tag
+ */
+ public JspTag getParent() {
+ return this.parentTag;
+ }
+
+ /**
+ * Stores the provided JSP context in the private jspContext field.
+ * Subclasses can access the JspContext via
+ * getJspContext().
+ *
+ * @param pc the page context for this invocation
+ * @see SimpleTag#setJspContext
+ */
+ public void setJspContext(JspContext pc) {
+ this.jspContext = pc;
+ }
+
+ /**
+ * Returns the page context passed in by the container via
+ * setJspContext.
+ *
+ * @return the page context for this invocation
+ */
+ protected JspContext getJspContext() {
+ return this.jspContext;
+ }
+
+ /**
+ * Stores the provided JspFragment.
+ *
+ * @param jspBody The fragment encapsulating the body of this tag.
+ * If the action element is empty in the page, this method is
+ * not called at all.
+ * @see SimpleTag#setJspBody
+ */
+ public void setJspBody(JspFragment jspBody) {
+ this.jspBody = jspBody;
+ }
+
+ /**
+ * Returns the body passed in by the container via setJspBody.
+ *
+ * @return the fragment encapsulating the body of this tag, or
+ * null if the action element is empty in the page.
+ */
+ protected JspFragment getJspBody() {
+ return this.jspBody;
+ }
+
+}
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/EJBLiteServlet2Filter.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/EJBLiteServlet2Filter.java
new file mode 100644
index 0000000000..6ac6f76493
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/EJBLiteServlet2Filter.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+
+package com.sun.ts.tests.jta.ee.transactional;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletResponse;
+import java.util.logging.Logger;
+import java.util.logging.Level;
+
+public class EJBLiteServlet2Filter extends Client implements Filter {
+ private static Logger logger = Logger.getLogger(EJBLiteServlet2Filter.class.getName());
+ private FilterConfig filterConfig;
+
+ public void doFilter(ServletRequest request, ServletResponse response,
+ FilterChain chain)
+ throws IOException, ServletException {
+ response.setContentType("text/plain");
+ setInjectionSupported(true);
+ String tn = request.getParameter("testName");
+ if(logger.isLoggable(Level.FINE)) {
+ logger.fine("doFilter testName=" + tn);
+ }
+ setTestName(tn);
+ setModuleName( ((HttpServletRequest) request).getContextPath() );
+ String sta = getStatus(); //to trigger the test run
+ PrintWriter pw = response.getWriter();
+ pw.println(sta + " " + getReason());
+ cleanup(); //need to reset all fields since filter instances are shared
+ //skip the rest of the chain
+ }
+
+ public void destroy() {
+ }
+
+ public void init(FilterConfig filterConfig) {
+ this.filterConfig = filterConfig;
+ }
+}
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/EJBLiteServletVehicle.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/EJBLiteServletVehicle.java
new file mode 100644
index 0000000000..63006f46e7
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/EJBLiteServletVehicle.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+
+package com.sun.ts.tests.jta.ee.transactional;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Enumeration;
+import java.util.Iterator;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import java.util.logging.Logger;
+import java.util.logging.Level;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+public class EJBLiteServletVehicle extends Client
+ implements Servlet, ServletConfig {
+
+ private static Logger logger = Logger.getLogger(EJBLiteServletVehicle.class.getName());
+
+ private HttpServletDelegate delegate = new HttpServletDelegate();
+
+ public void init(ServletConfig config) throws ServletException {
+ delegate.init(config);
+ }
+
+ public ServletConfig getServletConfig() {
+ return delegate.getServletConfig();
+ }
+
+ public void service(ServletRequest request, ServletResponse response) throws ServletException, IOException {
+ delegate.service(request, response);
+
+ setInjectionSupported(true);
+ String tn = request.getParameter("testName");
+ logger.fine("EJBLiteServletVehicle processing request testName=" + tn);
+ setTestName(tn);
+ setModuleName(getServletContext().getContextPath());
+ String sta = getStatus(); //to trigger the test run
+
+ PrintWriter pw = response.getWriter();
+ pw.println(sta + " " + getReason());
+ cleanup(); //need to reset all fields since servlet instances are shared
+
+ }
+
+ public String getServletInfo() {
+ return delegate.getServletInfo();
+ }
+
+ public void destroy() {
+ delegate.destroy();
+ delegate = null;
+ }
+
+ public String getServletName() {
+ return delegate.getServletName();
+ }
+
+ public ServletContext getServletContext() {
+ return delegate.getServletContext();
+ }
+
+ public String getInitParameter(String arg0) {
+ return delegate.getInitParameter(arg0);
+ }
+
+ public Enumeration getInitParameterNames() {
+ return delegate.getInitParameterNames();
+ }
+
+
+}
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/HttpServletDelegate.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/HttpServletDelegate.java
new file mode 100644
index 0000000000..7d4020b302
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/HttpServletDelegate.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+ package com.sun.ts.tests.jta.ee.transactional;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.ServletException;
+import java.util.logging.Logger;
+import java.util.logging.Level;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+public class HttpServletDelegate extends HttpServlet {
+
+ private static Logger logger = Logger.getLogger(HttpServletDelegate.class.getName());
+
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ processRequest(request, response);
+ }
+
+ @Override
+ protected void doPost(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ processRequest(request, response);
+ }
+
+ private void processRequest(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ response.setContentType("text/plain");
+ }
+ }
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/JsfClient.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/JsfClient.java.txt
similarity index 99%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/JsfClient.java
rename to jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/JsfClient.java.txt
index ac22a262c9..d34375ac4a 100644
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/JsfClient.java
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/JsfClient.java.txt
@@ -35,8 +35,8 @@
@jakarta.inject.Named("client")
@jakarta.enterprise.context.RequestScoped
-public class JsfClient extends EJBLiteJsfClientBase implements Serializable {
- private static final long serialVersionUID = 1L;
+public class JsfClient extends EJBLiteJsfClientBase {
+
private static StringBuilder callRecords = new StringBuilder();
@Inject
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientEjbTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientEjbTest.java
new file mode 100644
index 0000000000..f18b40cf1c
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientEjbTest.java
@@ -0,0 +1,243 @@
+package com.sun.ts.tests.jta.ee.txpropagationtest;
+
+import com.sun.ts.tests.jta.ee.txpropagationtest.Client;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+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.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+import java.lang.System.Logger;
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("jta")
+@Tag("platform")
+@Tag("tck-appclient")
+
+public class ClientEjbTest extends com.sun.ts.tests.jta.ee.txpropagationtest.Client {
+ static final String VEHICLE_ARCHIVE = "jta_ejb_vehicle";
+
+ private static String packagePath = ClientJspTest.class.getPackageName().replace(".", "/");
+
+ private static final Logger logger = System.getLogger(ClientEjbTest.class.getName());
+
+ @BeforeEach
+ void logStartTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "STARTING TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ void logFinishTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "FINISHED TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ public void cleanup() {
+ logger.log(Logger.Level.INFO, "cleanup ok");
+ }
+
+ /**
+ EE10 Deployment Descriptors:
+ jta_ee_txpropagate1_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ jta_ee_txpropagate2_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ jta_ee_txpropagate3_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ jta_ejb_vehicle:
+ jta_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+ jta_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ jta_jsp_vehicle:
+ jta_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+ jta_servlet_vehicle:
+ jta_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+ Found Descriptors:
+ Client:
+
+ /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+ Ejb:
+
+ /com/sun/ts/tests/jta/ee/txpropagationtest/ejb_vehicle_ejb.xml
+ /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+ Ear:
+
+ */
+ @TargetsContainer("tck-appclient")
+ @OverProtocol("appclient")
+ @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+ // Client
+ // the jar with the correct archive name
+ JavaArchive jta_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jta_ejb_vehicle_client.jar");
+ // The class files
+ jta_ejb_vehicle_client.addClasses(
+ com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+ com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+ com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+ com.sun.ts.lib.harness.EETest.Fault.class,
+ com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+ com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+ com.sun.ts.lib.harness.EETest.class,
+ com.sun.ts.lib.harness.ServiceEETest.class,
+ com.sun.ts.lib.harness.EETest.SetupException.class,
+ com.sun.ts.tests.common.vehicle.VehicleClient.class
+ );
+ // The application-client.xml descriptor
+ //TODO : replace display-name as jta_ejb_vehicle_client
+ URL resURL = ClientEjbTest.class.getResource("/vehicle/ejb/ejb_vehicle_client.xml");
+
+ if(resURL != null) {
+ jta_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+ }
+ // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+ resURL = ClientEjbTest.class.getResource("/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml");
+ if(resURL != null) {
+ jta_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+ }
+ jta_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + ClientEjbTest.class.getName() + "\n"), "MANIFEST.MF");
+ archiveProcessor.processClientArchive(jta_ejb_vehicle_client, ClientEjbTest.class, resURL);
+
+
+ // Ejb
+ // the jar with the correct archive name
+ JavaArchive jta_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "jta_ejb_vehicle_ejb.jar");
+ // The class files
+ jta_ejb_vehicle_ejb.addClasses(
+ com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+ com.sun.ts.lib.harness.EETest.Fault.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.TxBean.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanEJB.class,
+ com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class,
+ com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+ com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.Client.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.DBSupport.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.TxBean.class,
+ com.sun.ts.lib.harness.EETest.class,
+ com.sun.ts.lib.harness.ServiceEETest.class,
+ com.sun.ts.lib.harness.EETest.SetupException.class,
+ com.sun.ts.tests.common.vehicle.VehicleClient.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.DBSupport.class,
+ ClientEjbTest.class
+ );
+ // The ejb-jar.xml descriptor
+ URL ejbResURL = ClientEjbTest.class.getClassLoader().getResource(packagePath+"/ejb_vehicle_ejb.xml");
+ if(ejbResURL != null) {
+ jta_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
+ }
+ // The sun-ejb-jar.xml file
+ ejbResURL = ClientEjbTest.class.getClassLoader().getResource(packagePath+"/jta_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+ if(ejbResURL != null) {
+ jta_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
+ }
+ archiveProcessor.processEjbArchive(jta_ejb_vehicle_ejb, ClientEjbTest.class, ejbResURL);
+
+
+ JavaArchive jta_ee_txpropagate1_ejb = ShrinkWrap.create(JavaArchive.class, "jta_ee_txpropagate1_ejb.jar");
+ // The class files
+ jta_ee_txpropagate1_ejb.addClasses(
+ com.sun.ts.tests.jta.ee.txpropagationtest.TxBean.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanEJB.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanHome.class
+ );
+ // The ejb-jar.xml descriptor
+ ejbResURL = ClientEjbTest.class.getClassLoader().getResource(packagePath+"/jta_ee_txpropagate1_ejb.xml");
+ if(ejbResURL != null) {
+ jta_ee_txpropagate1_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
+ }
+ // The sun-ejb-jar.xml file
+ ejbResURL = ClientEjbTest.class.getClassLoader().getResource(packagePath+"/jta_ee_txpropagate1_ejb.jar.sun-ejb-jar.xml");
+ if(ejbResURL != null) {
+ jta_ee_txpropagate1_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
+ }
+ archiveProcessor.processEjbArchive(jta_ee_txpropagate1_ejb, ClientEjbTest.class, ejbResURL);
+
+
+ // Ear
+ EnterpriseArchive jta_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jta_ejb_vehicle.ear");
+
+ // Any libraries added to the ear
+
+ // The component jars built by the package target
+ jta_ejb_vehicle_ear.addAsModule(jta_ee_txpropagate1_ejb);
+ // jta_ejb_vehicle_ear.addAsModule(jta_ee_txpropagate2_ejb);
+ // jta_ejb_vehicle_ear.addAsModule(jta_ee_txpropagate3_ejb);
+ jta_ejb_vehicle_ear.addAsModule(jta_ejb_vehicle_ejb);
+ jta_ejb_vehicle_ear.addAsModule(jta_ejb_vehicle_client);
+
+
+
+ // // The application.xml descriptor
+ // URL earResURL = Client.class.getResource("/com/sun/ts/tests/jta/ee/txpropagationtest/");
+ // if(earResURL != null) {
+ // jta_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml");
+ // }
+ // The sun-application.xml descriptor
+ URL earResURL = Client.class.getClassLoader().getResource(packagePath+"/jta_ejb_vehicle_client.jar.sun-application-client.xml");
+ if(earResURL != null) {
+ jta_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+ }
+ archiveProcessor.processEarArchive(jta_ejb_vehicle_ear, Client.class, earResURL);
+
+ return jta_ejb_vehicle_ear;
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void test1() throws java.lang.Exception {
+ super.test1();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void test2() throws java.lang.Exception {
+ super.test2();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void test3() throws java.lang.Exception {
+ super.test3();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void test4() throws java.lang.Exception {
+ super.test4();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void test5() throws java.lang.Exception {
+ super.test5();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void test6() throws java.lang.Exception {
+ super.test6();
+ }
+
+
+}
\ No newline at end of file
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientJspTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientJspTest.java
new file mode 100644
index 0000000000..d4511b415f
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientJspTest.java
@@ -0,0 +1,216 @@
+package com.sun.ts.tests.jta.ee.txpropagationtest;
+
+import com.sun.ts.tests.jta.ee.txpropagationtest.Client;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+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.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+import java.lang.System.Logger;
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("jta")
+@Tag("platform")
+@Tag("tck-javatest")
+
+public class ClientJspTest extends com.sun.ts.tests.jta.ee.txpropagationtest.Client {
+ static final String VEHICLE_ARCHIVE = "jta_jsp_vehicle";
+
+ private static String packagePath = ClientJspTest.class.getPackageName().replace(".", "/");
+
+ private static final Logger logger = System.getLogger(ClientJspTest.class.getName());
+
+ @BeforeEach
+ void logStartTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "STARTING TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ void logFinishTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "FINISHED TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ public void cleanup() {
+ logger.log(Logger.Level.INFO, "cleanup ok");
+ }
+
+ /**
+ EE10 Deployment Descriptors:
+ jta_ee_txpropagate1_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ jta_ee_txpropagate2_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ jta_ee_txpropagate3_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ jta_ejb_vehicle:
+ jta_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+ jta_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ jta_jsp_vehicle:
+ jta_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+ jta_servlet_vehicle:
+ jta_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+ Found Descriptors:
+ Ejb:
+
+ /com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate3_ejb.xml
+ /com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate3_ejb.jar.sun-ejb-jar.xml
+ War:
+
+ /com/sun/ts/tests/jta/ee/txpropagationtest/jsp_vehicle_web.xml
+ /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+ Ear:
+
+ */
+ @TargetsContainer("tck-javatest")
+ @OverProtocol("javatest")
+ @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+ // War
+ // the war with the correct archive name
+ WebArchive jta_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "jta_jsp_vehicle_web.war");
+ // The class files
+ jta_jsp_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.txpropagationtest.TxBean.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanEJB.class,
+ com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.Client.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.DBSupport.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanHome.class,
+ com.sun.ts.lib.harness.EETest.class,
+ com.sun.ts.lib.harness.ServiceEETest.class,
+ com.sun.ts.lib.harness.EETest.SetupException.class,
+ com.sun.ts.tests.common.vehicle.VehicleClient.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.DBSupport.class,
+ ClientJspTest.class
+ );
+ // The web.xml descriptor
+ URL warResURL = ClientJspTest.class.getClassLoader().getResource(packagePath+"/jsp_vehicle_web.xml");
+ if(warResURL != null) {
+ jta_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+ }
+
+ // Web content
+ warResURL = ClientJspTest.class.getResource("/vehicle/jsp/contentRoot/client.html");
+ jta_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+ warResURL = ClientJspTest.class.getResource("/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+ jta_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+
+ // The sun-web.xml descriptor
+ warResURL = ClientJspTest.class.getClassLoader().getResource(packagePath+"/jta_jsp_vehicle_web.war.sun-web.xml");
+ if(warResURL != null) {
+ jta_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+ }
+
+ // archiveProcessor.processWebArchive(jta_jsp_vehicle_web, ClientJspTest.class, warResURL);
+
+ // Ejb
+ // the jar with the correct archive name
+ JavaArchive jta_ee_txpropagate3_ejb = ShrinkWrap.create(JavaArchive.class, "jta_ee_txpropagate3_ejb.jar");
+ // The class files
+ jta_ee_txpropagate3_ejb.addClasses(
+ com.sun.ts.tests.jta.ee.txpropagationtest.TxBean.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanEJB.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanHome.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.DBSupport.class
+ );
+ // The ejb-jar.xml descriptor
+ URL ejbResURL = ClientJspTest.class.getClassLoader().getResource(packagePath+"/jta_ee_txpropagate3_ejb.xml");
+ if(ejbResURL != null) {
+ jta_ee_txpropagate3_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
+ }
+ // The sun-ejb-jar.xml file
+ ejbResURL = ClientJspTest.class.getClassLoader().getResource(packagePath+"/jta_ee_txpropagate3_ejb.jar.sun-ejb-jar.xml");
+ if(ejbResURL != null) {
+ jta_ee_txpropagate3_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
+ }
+ // archiveProcessor.processEjbArchive(jta_ee_txpropagate3_ejb, ClientJspTest.class, ejbResURL);
+
+ // Ear
+ EnterpriseArchive jta_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jta_jsp_vehicle.ear");
+
+ // Any libraries added to the ear
+
+ // The component jars built by the package target
+ // jta_jsp_vehicle_ear.addAsModule(jta_ee_txpropagate1_ejb);
+ // jta_jsp_vehicle_ear.addAsModule(jta_ee_txpropagate2_ejb);
+ jta_jsp_vehicle_ear.addAsModule(jta_ee_txpropagate3_ejb);
+ jta_jsp_vehicle_ear.addAsModule(jta_jsp_vehicle_web);
+
+
+
+ // // The application.xml descriptor
+ // URL earResURL = Client.class.getResource("/com/sun/ts/tests/jta/ee/txpropagationtest/");
+ // if(earResURL != null) {
+ // jta_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml");
+ // }
+ // // The sun-application.xml descriptor
+ // earResURL = Client.class.getResource("/com/sun/ts/tests/jta/ee/txpropagationtest/.ear.sun-application.xml");
+ // if(earResURL != null) {
+ // jta_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+ // }
+ // archiveProcessor.processEarArchive(jta_jsp_vehicle_ear, Client.class, earResURL);
+ return jta_jsp_vehicle_ear;
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void test1() throws java.lang.Exception {
+ super.test1();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void test2() throws java.lang.Exception {
+ super.test2();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void test3() throws java.lang.Exception {
+ super.test3();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void test4() throws java.lang.Exception {
+ super.test4();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void test5() throws java.lang.Exception {
+ super.test5();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void test6() throws java.lang.Exception {
+ super.test6();
+ }
+
+
+}
\ No newline at end of file
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientServletTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientServletTest.java
new file mode 100644
index 0000000000..f64e063635
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientServletTest.java
@@ -0,0 +1,209 @@
+package com.sun.ts.tests.jta.ee.txpropagationtest;
+
+import com.sun.ts.tests.jta.ee.txpropagationtest.Client;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+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.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+import java.lang.System.Logger;
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("jta")
+@Tag("platform")
+@Tag("tck-javatest")
+
+public class ClientServletTest extends com.sun.ts.tests.jta.ee.txpropagationtest.Client {
+ static final String VEHICLE_ARCHIVE = "jta_servlet_vehicle";
+
+ private static String packagePath = ClientServletTest.class.getPackageName().replace(".", "/");
+
+ private static final Logger logger = System.getLogger(ClientServletTest.class.getName());
+
+ @BeforeEach
+ void logStartTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "STARTING TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ void logFinishTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "FINISHED TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ public void cleanup() {
+ logger.log(Logger.Level.INFO, "cleanup ok");
+ }
+
+ /**
+ EE10 Deployment Descriptors:
+ jta_ee_txpropagate1_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ jta_ee_txpropagate2_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ jta_ee_txpropagate3_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ jta_ejb_vehicle:
+ jta_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+ jta_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ jta_jsp_vehicle:
+ jta_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+ jta_servlet_vehicle:
+ jta_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+ Found Descriptors:
+ Ejb:
+
+ /com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate3_ejb.xml
+ /com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate3_ejb.jar.sun-ejb-jar.xml
+ War:
+
+ /com/sun/ts/tests/jta/ee/txpropagationtest/servlet_vehicle_web.xml
+ /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+ Ear:
+
+ */
+ @TargetsContainer("tck-javatest")
+ @OverProtocol("javatest")
+ @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+ // War
+ // the war with the correct archive name
+ WebArchive jta_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jta_servlet_vehicle_web.war");
+ // The class files
+ jta_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.txpropagationtest.TxBean.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanEJB.class,
+ com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+ com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.Client.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.DBSupport.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanHome.class,
+ com.sun.ts.lib.harness.EETest.class,
+ com.sun.ts.lib.harness.ServiceEETest.class,
+ com.sun.ts.lib.harness.EETest.SetupException.class,
+ com.sun.ts.tests.common.vehicle.VehicleClient.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.DBSupport.class,
+ ClientServletTest.class
+ );
+ // The web.xml descriptor
+ URL warResURL = ClientServletTest.class.getClassLoader().getResource(packagePath+"/servlet_vehicle_web.xml");
+ if(warResURL != null) {
+ jta_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+ }
+ // The sun-web.xml descriptor
+ warResURL = ClientServletTest.class.getClassLoader().getResource(packagePath+"/jta_servlet_vehicle_web.war.sun-web.xml");
+ if(warResURL != null) {
+ jta_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+ }
+ // Web content
+ // archiveProcessor.processWebArchive(jta_servlet_vehicle_web, ClientServletTest.class, warResURL);
+
+ // Ejb
+ // the jar with the correct archive name
+ JavaArchive jta_ee_txpropagate2_ejb = ShrinkWrap.create(JavaArchive.class, "jta_ee_txpropagate2_ejb.jar");
+ // The class files
+ jta_ee_txpropagate2_ejb.addClasses(
+ com.sun.ts.tests.jta.ee.txpropagationtest.TxBean.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanEJB.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanHome.class,
+ com.sun.ts.tests.jta.ee.txpropagationtest.DBSupport.class
+ );
+ // The ejb-jar.xml descriptor
+ URL ejbResURL = ClientServletTest.class.getClassLoader().getResource(packagePath+"/jta_ee_txpropagate2_ejb.xml");
+ if(ejbResURL != null) {
+ jta_ee_txpropagate2_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
+ }
+ // The sun-ejb-jar.xml file
+ ejbResURL = ClientServletTest.class.getClassLoader().getResource(packagePath+"/jta_ee_txpropagate2_ejb.jar.sun-ejb-jar.xml");
+ if(ejbResURL != null) {
+ jta_ee_txpropagate2_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
+ }
+ // archiveProcessor.processEjbArchive(jta_ee_txpropagate2_ejb, ClientServletTest.class, ejbResURL);
+
+ // Ear
+ EnterpriseArchive jta_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jta_servlet_vehicle.ear");
+
+ // Any libraries added to the ear
+
+ // The component jars built by the package target
+ // jta_servlet_vehicle_ear.addAsModule(jta_ee_txpropagate1_ejb);
+ jta_servlet_vehicle_ear.addAsModule(jta_ee_txpropagate2_ejb);
+ // jta_servlet_vehicle_ear.addAsModule(jta_ee_txpropagate3_ejb);
+ jta_servlet_vehicle_ear.addAsModule(jta_servlet_vehicle_web);
+
+
+ // // The application.xml descriptor
+ // URL earResURL = Client.class.getResource("/com/sun/ts/tests/jta/ee/txpropagationtest/");
+ // if(earResURL != null) {
+ // jta_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml");
+ // }
+ // // The sun-application.xml descriptor
+ // earResURL = Client.class.getResource("/com/sun/ts/tests/jta/ee/txpropagationtest/.ear.sun-application.xml");
+ // if(earResURL != null) {
+ // jta_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+ // }
+ // archiveProcessor.processEarArchive(jta_servlet_vehicle_ear, Client.class, earResURL);
+ return jta_servlet_vehicle_ear;
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void test1() throws java.lang.Exception {
+ super.test1();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void test2() throws java.lang.Exception {
+ super.test2();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void test3() throws java.lang.Exception {
+ super.test3();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void test4() throws java.lang.Exception {
+ super.test4();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void test5() throws java.lang.Exception {
+ super.test5();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void test6() throws java.lang.Exception {
+ super.test6();
+ }
+
+
+}
\ No newline at end of file
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/TxBeanHome.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/TxBeanHome.java
new file mode 100644
index 0000000000..f80db86de3
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/TxBeanHome.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+
+package com.sun.ts.tests.jta.ee.txpropagationtest;
+
+import java.rmi.RemoteException;
+import java.util.Properties;
+
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+
+public interface TxBeanHome extends EJBHome {
+ public TxBean create(Properties p) throws RemoteException, CreateException;
+}
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClient.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClient.java
index d08584e6cd..03588dbefe 100644
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClient.java
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClient.java
@@ -45,6 +45,8 @@
public class UserBeginClient extends ServiceEETest implements Serializable {
private static final String testName = "jta.ee.usertransaction.begin";
+ private static String packagePath = UserBeginClientJspTest.class.getPackageName().replace(".", "/");
+
private UserTransaction userTransaction = null;
public void setup(String[] args, Properties p) throws Exception {
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClientEjbTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClientEjbTest.java
new file mode 100644
index 0000000000..bdf8a59346
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClientEjbTest.java
@@ -0,0 +1,189 @@
+package com.sun.ts.tests.jta.ee.usertransaction.begin;
+
+import com.sun.ts.tests.jta.ee.usertransaction.begin.UserBeginClient;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+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.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+import java.lang.System.Logger;
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("jta")
+@Tag("platform")
+@Tag("web")
+@Tag("tck-appclient")
+
+public class UserBeginClientEjbTest extends com.sun.ts.tests.jta.ee.usertransaction.begin.UserBeginClient {
+ static final String VEHICLE_ARCHIVE = "begin_ejb_vehicle";
+
+ private static String packagePath = UserBeginClientEjbTest.class.getPackageName().replace(".", "/");
+
+ private static final Logger logger = System.getLogger(UserBeginClientEjbTest.class.getName());
+
+ @BeforeEach
+ void logStartTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "STARTING TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ void logFinishTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "FINISHED TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ public void cleanup() {
+ logger.log(Logger.Level.INFO, "cleanup ok");
+ }
+
+ /**
+ EE10 Deployment Descriptors:
+ begin_ejb_vehicle:
+ begin_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+ begin_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ begin_jsp_vehicle:
+ begin_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+ begin_servlet_vehicle:
+ begin_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+ Found Descriptors:
+ Client:
+
+ /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+ Ejb:
+
+ /com/sun/ts/tests/jta/ee/usertransaction/begin/ejb_vehicle_ejb.xml
+ /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+ Ear:
+
+ */
+ @TargetsContainer("tck-appclient")
+ @OverProtocol("appclient")
+ @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+ // Client
+ // the jar with the correct archive name
+ JavaArchive begin_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "begin_ejb_vehicle_client.jar");
+ // The class files
+ begin_ejb_vehicle_client.addClasses(
+ com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+ com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+ com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+ com.sun.ts.lib.harness.EETest.Fault.class,
+ com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+ com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+ com.sun.ts.lib.harness.EETest.class,
+ com.sun.ts.lib.harness.ServiceEETest.class,
+ com.sun.ts.lib.harness.EETest.SetupException.class,
+ com.sun.ts.tests.common.vehicle.VehicleClient.class,
+ UserBeginClientEjbTest.class
+ );
+ // The application-client.xml descriptor
+ //TODO : replace display-name begin_ejb_vehicle_client
+ URL resURL = UserBeginClientEjbTest.class.getResource("/vehicle/ejb/ejb_vehicle_client.xml");
+ if(resURL != null) {
+ begin_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+ }
+ // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+ resURL = UserBeginClientEjbTest.class.getResource("/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml");
+ if(resURL != null) {
+ begin_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+ }
+ begin_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + UserBeginClientEjbTest.class.getName() + "\n"), "MANIFEST.MF");
+ archiveProcessor.processClientArchive(begin_ejb_vehicle_client, UserBeginClientEjbTest.class, resURL);
+
+
+ // Ejb
+ // the jar with the correct archive name
+ JavaArchive begin_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "begin_ejb_vehicle_ejb.jar");
+ // The class files
+ begin_ejb_vehicle_ejb.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.common.vehicle.ejb.EJBVehicle.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.common.vehicle.ejb.EJBVehicleRemote.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,
+ UserBeginClientEjbTest.class
+ );
+ // The ejb-jar.xml descriptor
+ URL ejbResURL = UserBeginClient.class.getClassLoader().getResource(packagePath+"/ejb_vehicle_ejb.xml");
+ if(ejbResURL != null) {
+ begin_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
+ }
+ // The sun-ejb-jar.xml file
+ ejbResURL = UserBeginClient.class.getClassLoader().getResource(packagePath+"/begin_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+ if(ejbResURL != null) {
+ begin_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
+ }
+ archiveProcessor.processEjbArchive(begin_ejb_vehicle_ejb, UserBeginClient.class, ejbResURL);
+
+ // Ear
+ EnterpriseArchive begin_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "begin_ejb_vehicle.ear");
+
+ // Any libraries added to the ear
+
+ // The component jars built by the package target
+ begin_ejb_vehicle_ear.addAsModule(begin_ejb_vehicle_ejb);
+ begin_ejb_vehicle_ear.addAsModule(begin_ejb_vehicle_client);
+
+
+ // The application.xml descriptor
+ URL earResURL = UserBeginClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/begin/");
+ if(earResURL != null) {
+ begin_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml");
+ }
+ // The sun-application.xml descriptor
+ earResURL = UserBeginClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/begin/begin_ejb_vehicle_client.jar.sun-application-client.xml");
+ if(earResURL != null) {
+ begin_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+ }
+ archiveProcessor.processEarArchive(begin_ejb_vehicle_ear, UserBeginClient.class, earResURL);
+
+ return begin_ejb_vehicle_ear;
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void testUserBegin001() throws java.lang.Exception {
+ super.testUserBegin001();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void testUserBegin002() throws java.lang.Exception {
+ super.testUserBegin002();
+ }
+
+
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..1269e3ed35
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClientJspTest.java
@@ -0,0 +1,138 @@
+package com.sun.ts.tests.jta.ee.usertransaction.begin;
+
+import com.sun.ts.tests.jta.ee.usertransaction.begin.UserBeginClient;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+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.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+import java.lang.System.Logger;
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("jta")
+@Tag("platform")
+@Tag("web")
+@Tag("tck-javatest")
+
+public class UserBeginClientJspTest extends com.sun.ts.tests.jta.ee.usertransaction.begin.UserBeginClient {
+ static final String VEHICLE_ARCHIVE = "begin_jsp_vehicle";
+
+ private static String packagePath = UserBeginClientJspTest.class.getPackageName().replace(".", "/");
+
+ private static final Logger logger = System.getLogger(UserBeginClientJspTest.class.getName());
+
+ @BeforeEach
+ void logStartTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "STARTING TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ void logFinishTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "FINISHED TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ public void cleanup() {
+ logger.log(Logger.Level.INFO, "cleanup ok");
+ }
+
+ /**
+ EE10 Deployment Descriptors:
+ begin_ejb_vehicle:
+ begin_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+ begin_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ begin_jsp_vehicle:
+ begin_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+ begin_servlet_vehicle:
+ begin_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+ Found Descriptors:
+ War:
+
+ /com/sun/ts/tests/jta/ee/usertransaction/begin/jsp_vehicle_web.xml
+ /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+ Ear:
+
+ */
+ @TargetsContainer("tck-javatest")
+ @OverProtocol("javatest")
+ @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+ // War
+ // the war with the correct archive name
+ WebArchive begin_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "begin_jsp_vehicle_web.war");
+ // The class files
+ begin_jsp_vehicle_web.addClasses(
+ com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.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.lib.harness.EETest.Fault.class,
+ com.sun.ts.lib.harness.EETest.class,
+ com.sun.ts.lib.harness.ServiceEETest.class,
+ com.sun.ts.lib.harness.EETest.SetupException.class,
+ UserBeginClientJspTest.class
+ );
+ // The web.xml descriptor
+ URL warResURL = UserBeginClientJspTest.class.getClassLoader().getResource(packagePath+"/jsp_vehicle_web.xml");
+ if(warResURL != null) {
+ begin_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+ }
+ // Web content
+ warResURL = UserBeginClientJspTest.class.getResource("/vehicle/jsp/contentRoot/client.html");
+ begin_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+ warResURL = UserBeginClientJspTest.class.getResource("/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+ 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");
+ // }
+
+
+ // archiveProcessor.processWebArchive(begin_jsp_vehicle_web, UserBeginClientJspTest.class, warResURL);
+
+ // Ear
+ EnterpriseArchive begin_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "begin_jsp_vehicle.ear");
+ begin_jsp_vehicle_ear.addAsModule(begin_jsp_vehicle_web);
+ return begin_jsp_vehicle_ear;
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void testUserBegin001() throws java.lang.Exception {
+ super.testUserBegin001();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void testUserBegin002() throws java.lang.Exception {
+ super.testUserBegin002();
+ }
+
+
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..5dc77be1d7
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClientServletTest.java
@@ -0,0 +1,135 @@
+package com.sun.ts.tests.jta.ee.usertransaction.begin;
+
+import com.sun.ts.tests.jta.ee.usertransaction.begin.UserBeginClient;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+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.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+import java.lang.System.Logger;
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("jta")
+@Tag("platform")
+@Tag("web")
+@Tag("tck-javatest")
+
+public class UserBeginClientServletTest extends com.sun.ts.tests.jta.ee.usertransaction.begin.UserBeginClient {
+ static final String VEHICLE_ARCHIVE = "begin_servlet_vehicle";
+
+ private static String packagePath = UserBeginClientServletTest.class.getPackageName().replace(".", "/");
+
+ private static final Logger logger = System.getLogger(UserBeginClientServletTest.class.getName());
+
+ @BeforeEach
+ void logStartTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "STARTING TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ void logFinishTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "FINISHED TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ public void cleanup() {
+ logger.log(Logger.Level.INFO, "cleanup ok");
+ }
+
+ /**
+ EE10 Deployment Descriptors:
+ begin_ejb_vehicle:
+ begin_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+ begin_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ begin_jsp_vehicle:
+ begin_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+ begin_servlet_vehicle:
+ begin_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+ Found Descriptors:
+ War:
+
+ /com/sun/ts/tests/jta/ee/usertransaction/begin/servlet_vehicle_web.xml
+ /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+ Ear:
+
+ */
+ @TargetsContainer("tck-javatest")
+ @OverProtocol("javatest")
+ @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+ // War
+ // the war with the correct archive name
+ 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.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");
+ if(warResURL != null) {
+ begin_servlet_vehicle_web.setWebXML(warResURL);
+ }
+ // The sun-web.xml descriptor
+ warResURL = UserBeginClientServletTest.class.getClassLoader().getResource(packagePath+"/begin_servlet_vehicle_web.war.sun-web.xml");
+ if(warResURL != null) {
+ begin_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+ }
+ // Web content
+ archiveProcessor.processWebArchive(begin_servlet_vehicle_web, UserBeginClientServletTest.class, warResURL);
+
+ // Ear
+ EnterpriseArchive begin_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "begin_servlet_vehicle.ear");
+ begin_servlet_vehicle_ear.addAsModule(begin_servlet_vehicle_web);
+ return begin_servlet_vehicle_ear;
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void testUserBegin001() throws java.lang.Exception {
+ super.testUserBegin001();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void testUserBegin002() throws java.lang.Exception {
+ super.testUserBegin002();
+ }
+
+
+}
\ No newline at end of file
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/UserCommitClientEjbTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/UserCommitClientEjbTest.java
new file mode 100644
index 0000000000..f19d6d4b4e
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/UserCommitClientEjbTest.java
@@ -0,0 +1,210 @@
+package com.sun.ts.tests.jta.ee.usertransaction.commit;
+
+import com.sun.ts.tests.jta.ee.usertransaction.commit.UserCommitClient;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+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.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+import java.lang.System.Logger;
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("jta")
+@Tag("platform")
+@Tag("web")
+@Tag("tck-appclient")
+
+public class UserCommitClientEjbTest extends com.sun.ts.tests.jta.ee.usertransaction.commit.UserCommitClient {
+ static final String VEHICLE_ARCHIVE = "commit_ejb_vehicle";
+
+ private static String packagePath = UserCommitClientEjbTest.class.getPackageName().replace(".", "/");
+
+ private static final Logger logger = System.getLogger(UserCommitClientEjbTest.class.getName());
+
+ @BeforeEach
+ void logStartTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "STARTING TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ void logFinishTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "FINISHED TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ public void cleanup() {
+ logger.log(Logger.Level.INFO, "cleanup ok");
+ }
+
+ /**
+ EE10 Deployment Descriptors:
+ commit_ejb_vehicle:
+ commit_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+ commit_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ commit_jsp_vehicle:
+ commit_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+ commit_servlet_vehicle:
+ commit_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+ Found Descriptors:
+ Client:
+
+ /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+ Ejb:
+
+ /com/sun/ts/tests/jta/ee/usertransaction/commit/ejb_vehicle_ejb.xml
+ /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+ Ear:
+
+ */
+ @TargetsContainer("tck-appclient")
+ @OverProtocol("appclient")
+ @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+ // Client
+ // the jar with the correct archive name
+ JavaArchive commit_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "commit_ejb_vehicle_client.jar");
+ // The class files
+ commit_ejb_vehicle_client.addClasses(
+ com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+ com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+ com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+ com.sun.ts.lib.harness.EETest.Fault.class,
+ com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+ com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+ com.sun.ts.lib.harness.EETest.class,
+ com.sun.ts.lib.harness.ServiceEETest.class,
+ com.sun.ts.lib.harness.EETest.SetupException.class,
+ com.sun.ts.tests.common.vehicle.VehicleClient.class,
+ UserCommitClientEjbTest.class
+ );
+ // The application-client.xml descriptor
+ // TODO replace display-name
+ URL resURL = UserCommitClientEjbTest.class.getResource("/vehicle/ejb/ejb_vehicle_client.xml");
+ if(resURL != null) {
+ commit_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+ }
+ // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+ resURL = UserCommitClientEjbTest.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml");
+ if(resURL != null) {
+ commit_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+ }
+ commit_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + UserCommitClientEjbTest.class.getName() + "\n"), "MANIFEST.MF");
+ archiveProcessor.processClientArchive(commit_ejb_vehicle_client, UserCommitClientEjbTest.class, resURL);
+
+
+ // Ejb
+ // the jar with the correct archive name
+ JavaArchive commit_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "commit_ejb_vehicle_ejb.jar");
+ // The class files
+ commit_ejb_vehicle_ejb.addClasses(
+ 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.common.vehicle.ejb.EJBVehicle.class,
+ com.sun.ts.tests.jta.ee.common.InitFailedException.class,
+ com.sun.ts.tests.jta.ee.common.TransactionStatus.class,
+ com.sun.ts.tests.jta.ee.usertransaction.commit.UserCommitClient.class,
+ com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+ com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.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,
+ UserCommitClientEjbTest.class
+ );
+ // The ejb-jar.xml descriptor
+ URL ejbResURL = UserCommitClientEjbTest.class.getResource("/ejb_vehicle_ejb.xml");
+ if(ejbResURL != null) {
+ commit_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
+ }
+ // The sun-ejb-jar.xml file
+ ejbResURL = UserCommitClientEjbTest.class.getResource("/ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+ if(ejbResURL != null) {
+ commit_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
+ }
+ archiveProcessor.processEjbArchive(commit_ejb_vehicle_ejb, UserCommitClientEjbTest.class, ejbResURL);
+
+ // Ear
+ EnterpriseArchive commit_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "commit_ejb_vehicle.ear");
+
+ // Any libraries added to the ear
+
+ // The component jars built by the package target
+ commit_ejb_vehicle_ear.addAsModule(commit_ejb_vehicle_ejb);
+ commit_ejb_vehicle_ear.addAsModule(commit_ejb_vehicle_client);
+
+
+
+ // // The application.xml descriptor
+ // URL earResURL = UserCommitClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/commit/");
+ // if(earResURL != null) {
+ // commit_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml");
+ // }
+ // The sun-application.xml descriptor
+ URL earResURL = UserCommitClientEjbTest.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/commit/commit_ejb_vehicle_client.jar.sun-application-client.xml");
+ if(earResURL != null) {
+ commit_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+ }
+ archiveProcessor.processEarArchive(commit_ejb_vehicle_ear, UserCommitClientEjbTest.class, earResURL);
+ return commit_ejb_vehicle_ear;
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void testUserCommit001() throws java.lang.Exception {
+ super.testUserCommit001();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void testUserCommit002() throws java.lang.Exception {
+ super.testUserCommit002();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void testUserCommit003() throws java.lang.Exception {
+ super.testUserCommit003();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void testUserCommit004() throws java.lang.Exception {
+ super.testUserCommit004();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void testUserCommit005() throws java.lang.Exception {
+ super.testUserCommit005();
+ }
+
+
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..2b1bf52669
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/UserCommitClientJspTest.java
@@ -0,0 +1,161 @@
+package com.sun.ts.tests.jta.ee.usertransaction.commit;
+
+import com.sun.ts.tests.jta.ee.usertransaction.commit.UserCommitClient;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+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.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+import java.lang.System.Logger;
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("jta")
+@Tag("platform")
+@Tag("web")
+@Tag("tck-javatest")
+
+public class UserCommitClientJspTest extends com.sun.ts.tests.jta.ee.usertransaction.commit.UserCommitClient {
+ static final String VEHICLE_ARCHIVE = "commit_jsp_vehicle";
+
+ private static String packagePath = UserCommitClientJspTest.class.getPackageName().replace(".", "/");
+
+ private static final Logger logger = System.getLogger(UserCommitClientJspTest.class.getName());
+
+ @BeforeEach
+ void logStartTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "STARTING TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ void logFinishTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "FINISHED TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ public void cleanup() {
+ logger.log(Logger.Level.INFO, "cleanup ok");
+ }
+
+ /**
+ EE10 Deployment Descriptors:
+ commit_ejb_vehicle:
+ commit_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+ commit_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ commit_jsp_vehicle:
+ commit_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+ commit_servlet_vehicle:
+ commit_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+ Found Descriptors:
+ War:
+
+ /com/sun/ts/tests/jta/ee/usertransaction/commit/jsp_vehicle_web.xml
+ /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+ Ear:
+
+ */
+ @TargetsContainer("tck-javatest")
+ @OverProtocol("javatest")
+ @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+ // War
+ // the war with the correct archive name
+ WebArchive commit_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "commit_jsp_vehicle_web.war");
+ // The class files
+ commit_jsp_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.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.jta.ee.usertransaction.commit.UserCommitClient.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,
+ UserCommitClientJspTest.class
+ );
+ // The web.xml descriptor
+ URL warResURL = UserCommitClientJspTest.class.getClassLoader().getResource(packagePath+"/jsp_vehicle_web.xml");
+ if(warResURL != null) {
+ commit_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+ }
+ // Web content
+ warResURL = UserCommitClientJspTest.class.getResource("/vehicle/jsp/contentRoot/client.html");
+ commit_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+ warResURL = UserCommitClientJspTest.class.getResource("/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+ commit_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+
+ // The sun-web.xml descriptor
+ warResURL = UserCommitClientJspTest.class.getClassLoader().getResource(packagePath+"/commit_jsp_vehicle_web.war.sun-web.xml");
+ if(warResURL != null) {
+ commit_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+ }
+
+ archiveProcessor.processWebArchive(commit_jsp_vehicle_web, UserCommitClientJspTest.class, warResURL);
+
+ // Ear
+ EnterpriseArchive commit_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "commit_jsp_vehicle.ear");
+ commit_jsp_vehicle_ear.addAsModule(commit_jsp_vehicle_web);
+ return commit_jsp_vehicle_ear;
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void testUserCommit001() throws java.lang.Exception {
+ super.testUserCommit001();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void testUserCommit002() throws java.lang.Exception {
+ super.testUserCommit002();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void testUserCommit003() throws java.lang.Exception {
+ super.testUserCommit003();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void testUserCommit004() throws java.lang.Exception {
+ super.testUserCommit004();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void testUserCommit005() throws java.lang.Exception {
+ super.testUserCommit005();
+ }
+
+
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..58f71922d3
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/UserCommitClientServletTest.java
@@ -0,0 +1,156 @@
+package com.sun.ts.tests.jta.ee.usertransaction.commit;
+
+import com.sun.ts.tests.jta.ee.usertransaction.commit.UserCommitClient;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+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.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+import java.lang.System.Logger;
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("jta")
+@Tag("platform")
+@Tag("web")
+@Tag("tck-javatest")
+
+public class UserCommitClientServletTest extends com.sun.ts.tests.jta.ee.usertransaction.commit.UserCommitClient {
+ static final String VEHICLE_ARCHIVE = "commit_servlet_vehicle";
+
+ private static String packagePath = UserCommitClientServletTest.class.getPackageName().replace(".", "/");
+
+ private static final Logger logger = System.getLogger(UserCommitClientServletTest.class.getName());
+
+ @BeforeEach
+ void logStartTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "STARTING TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ void logFinishTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "FINISHED TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ public void cleanup() {
+ logger.log(Logger.Level.INFO, "cleanup ok");
+ }
+
+ /**
+ EE10 Deployment Descriptors:
+ commit_ejb_vehicle:
+ commit_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+ commit_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ commit_jsp_vehicle:
+ commit_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+ commit_servlet_vehicle:
+ commit_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+ Found Descriptors:
+ War:
+
+ /com/sun/ts/tests/jta/ee/usertransaction/commit/servlet_vehicle_web.xml
+ /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+ Ear:
+
+ */
+ @TargetsContainer("tck-javatest")
+ @OverProtocol("javatest")
+ @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+ // War
+ // the war with the correct archive name
+ WebArchive commit_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "commit_servlet_vehicle_web.war");
+ // The class files
+ commit_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.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.commit.UserCommitClient.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,
+ UserCommitClientServletTest.class
+ );
+ // The web.xml descriptor
+ URL warResURL = UserCommitClientServletTest.class.getClassLoader().getResource(packagePath+"/servlet_vehicle_web.xml");
+ if(warResURL != null) {
+ commit_servlet_vehicle_web.setWebXML(warResURL);
+ }
+ // The sun-web.xml descriptor
+ warResURL = UserCommitClientServletTest.class.getClassLoader().getResource(packagePath+"/commit_servlet_vehicle_web.war.sun-web.xml");
+ if(warResURL != null) {
+ commit_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+ }
+ // Web content
+ archiveProcessor.processWebArchive(commit_servlet_vehicle_web, UserCommitClientServletTest.class, warResURL);
+
+ // Ear
+ EnterpriseArchive commit_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "commit_servlet_vehicle.ear");
+ commit_servlet_vehicle_ear.addAsModule(commit_servlet_vehicle_web);
+ return commit_servlet_vehicle_ear;
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void testUserCommit001() throws java.lang.Exception {
+ super.testUserCommit001();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void testUserCommit002() throws java.lang.Exception {
+ super.testUserCommit002();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void testUserCommit003() throws java.lang.Exception {
+ super.testUserCommit003();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void testUserCommit004() throws java.lang.Exception {
+ super.testUserCommit004();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void testUserCommit005() throws java.lang.Exception {
+ super.testUserCommit005();
+ }
+
+
+}
\ No newline at end of file
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/UserGetStatusClientEjbTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/UserGetStatusClientEjbTest.java
new file mode 100644
index 0000000000..788c68544e
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/UserGetStatusClientEjbTest.java
@@ -0,0 +1,211 @@
+package com.sun.ts.tests.jta.ee.usertransaction.getstatus;
+
+import com.sun.ts.tests.jta.ee.usertransaction.getstatus.UserGetStatusClient;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+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.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+import java.lang.System.Logger;
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("jta")
+@Tag("platform")
+@Tag("web")
+@Tag("tck-appclient")
+
+public class UserGetStatusClientEjbTest extends com.sun.ts.tests.jta.ee.usertransaction.getstatus.UserGetStatusClient {
+ static final String VEHICLE_ARCHIVE = "getstatus_ejb_vehicle";
+
+ private static String packagePath = UserGetStatusClientEjbTest.class.getPackageName().replace(".", "/");
+
+ private static final Logger logger = System.getLogger(UserGetStatusClientEjbTest.class.getName());
+
+ @BeforeEach
+ void logStartTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "STARTING TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ void logFinishTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "FINISHED TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ public void cleanup() {
+ logger.log(Logger.Level.INFO, "cleanup ok");
+ }
+
+ /**
+ EE10 Deployment Descriptors:
+ getstatus_ejb_vehicle:
+ getstatus_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+ getstatus_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ getstatus_jsp_vehicle:
+ getstatus_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+ getstatus_servlet_vehicle:
+ getstatus_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+ Found Descriptors:
+ Client:
+
+ /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+ Ejb:
+
+ /com/sun/ts/tests/jta/ee/usertransaction/getstatus/ejb_vehicle_ejb.xml
+ /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+ Ear:
+
+ */
+ @TargetsContainer("tck-appclient")
+ @OverProtocol("appclient")
+ @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+ // Client
+ // the jar with the correct archive name
+ JavaArchive getstatus_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "getstatus_ejb_vehicle_client.jar");
+ // The class files
+ getstatus_ejb_vehicle_client.addClasses(
+ com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+ com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+ com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+ com.sun.ts.lib.harness.EETest.Fault.class,
+ com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+ com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+ com.sun.ts.lib.harness.EETest.class,
+ com.sun.ts.lib.harness.ServiceEETest.class,
+ com.sun.ts.lib.harness.EETest.SetupException.class,
+ com.sun.ts.tests.common.vehicle.VehicleClient.class,
+ com.sun.ts.tests.jta.ee.usertransaction.getstatus.UserGetStatusClient.class,
+ UserGetStatusClientEjbTest.class
+ );
+ // The application-client.xml descriptor
+ // TODO: replace display-name
+ URL resURL = UserGetStatusClientEjbTest.class.getResource("/vehicle/ejb/ejb_vehicle_client.xml");
+ if(resURL != null) {
+ getstatus_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+ }
+ // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+ // resURL = UserGetStatusClient.class.getResource("/getstatus_jsp_vehicle_web.war.sun-web.xml");
+ // if(resURL != null) {
+ // getstatus_ejb_vehicle_client.addAsManifestResource(resURL, "sun-web.xml");
+ // }
+ getstatus_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + UserGetStatusClientEjbTest.class.getName() + "\n"), "MANIFEST.MF");
+ archiveProcessor.processClientArchive(getstatus_ejb_vehicle_client, UserGetStatusClientEjbTest.class, resURL);
+
+
+ // Ejb
+ // the jar with the correct archive name
+ JavaArchive getstatus_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "getstatus_ejb_vehicle_ejb.jar");
+ // The class files
+ getstatus_ejb_vehicle_ejb.addClasses(
+ com.sun.ts.tests.jta.ee.usertransaction.getstatus.UserGetStatusClientEjbTest.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.common.vehicle.ejb.EJBVehicle.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.common.vehicle.ejb.EJBVehicleRemote.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,
+ UserGetStatusClientEjbTest.class
+ );
+ // The ejb-jar.xml descriptor
+ URL ejbResURL = UserGetStatusClientEjbTest.class.getResource("/ejb_vehicle_ejb.xml");
+ if(ejbResURL != null) {
+ getstatus_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
+ }
+ // The sun-ejb-jar.xml file
+ ejbResURL = UserGetStatusClientEjbTest.class.getResource("/getstatus_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+ if(ejbResURL != null) {
+ getstatus_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
+ }
+ archiveProcessor.processEjbArchive(getstatus_ejb_vehicle_ejb, UserGetStatusClientEjbTest.class, ejbResURL);
+
+ // Ear
+ EnterpriseArchive getstatus_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "getstatus_ejb_vehicle.ear");
+
+ // Any libraries added to the ear
+
+ // The component jars built by the package target
+ getstatus_ejb_vehicle_ear.addAsModule(getstatus_ejb_vehicle_ejb);
+ getstatus_ejb_vehicle_ear.addAsModule(getstatus_ejb_vehicle_client);
+
+
+
+ // // The application.xml descriptor
+ // URL earResURL = UserGetStatusClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/getstatus/");
+ // if(earResURL != null) {
+ // getstatus_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml");
+ // }
+ // // The sun-application.xml descriptor
+ // earResURL = UserGetStatusClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/getstatus/.ear.sun-application.xml");
+ // if(earResURL != null) {
+ // getstatus_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+ // }
+ // archiveProcessor.processEarArchive(getstatus_ejb_vehicle_ear, UserGetStatusClient.class, earResURL);
+ return getstatus_ejb_vehicle_ear;
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void testUserGetStatus001() throws java.lang.Exception {
+ super.testUserGetStatus001();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void testUserGetStatus002() throws java.lang.Exception {
+ super.testUserGetStatus002();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void testUserGetStatus003() throws java.lang.Exception {
+ super.testUserGetStatus003();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void testUserGetStatus004() throws java.lang.Exception {
+ super.testUserGetStatus004();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void testUserGetStatus005() throws java.lang.Exception {
+ super.testUserGetStatus005();
+ }
+
+
+}
\ No newline at end of file
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/UserGetStatusClientJspTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/UserGetStatusClientJspTest.java
new file mode 100644
index 0000000000..0c5a94186b
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/UserGetStatusClientJspTest.java
@@ -0,0 +1,181 @@
+package com.sun.ts.tests.jta.ee.usertransaction.getstatus;
+
+import com.sun.ts.tests.jta.ee.usertransaction.getstatus.UserGetStatusClient;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+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.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+import java.lang.System.Logger;
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("jta")
+@Tag("platform")
+@Tag("web")
+@Tag("tck-javatest")
+
+public class UserGetStatusClientJspTest extends com.sun.ts.tests.jta.ee.usertransaction.getstatus.UserGetStatusClient {
+ static final String VEHICLE_ARCHIVE = "getstatus_jsp_vehicle";
+
+ private static String packagePath = UserGetStatusClientJspTest.class.getPackageName().replace(".", "/");
+
+ private static final Logger logger = System.getLogger(UserGetStatusClientJspTest.class.getName());
+
+ @BeforeEach
+ void logStartTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "STARTING TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ void logFinishTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "FINISHED TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ public void cleanup() {
+ logger.log(Logger.Level.INFO, "cleanup ok");
+ }
+
+ /**
+ EE10 Deployment Descriptors:
+ getstatus_ejb_vehicle:
+ getstatus_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+ getstatus_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ getstatus_jsp_vehicle:
+ getstatus_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+ getstatus_servlet_vehicle:
+ getstatus_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+ Found Descriptors:
+ War:
+
+ /com/sun/ts/tests/jta/ee/usertransaction/getstatus/jsp_vehicle_web.xml
+ /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+ Ear:
+
+ */
+ @TargetsContainer("tck-javatest")
+ @OverProtocol("javatest")
+ @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+ // War
+ // the war with the correct archive name
+ WebArchive getstatus_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "getstatus_jsp_vehicle_web.war");
+ // The class files
+ getstatus_jsp_vehicle_web.addClasses(
+ com.sun.ts.tests.jta.ee.usertransaction.getstatus.UserGetStatusClient.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.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,
+ UserGetStatusClientJspTest.class
+ );
+ // The web.xml descriptor
+ URL warResURL = UserGetStatusClientJspTest.class.getClassLoader().getResource(packagePath+"/jsp_vehicle_web.xml");
+ if(warResURL != null) {
+ getstatus_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+ }
+
+ // Web content
+ warResURL = UserGetStatusClientJspTest.class.getResource("/vehicle/jsp/contentRoot/client.html");
+ getstatus_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+ warResURL = UserGetStatusClientJspTest.class.getResource("/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+ getstatus_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+
+ // The sun-web.xml descriptor
+ warResURL = UserGetStatusClientJspTest.class.getClassLoader().getResource(packagePath+"/getstatus_jsp_vehicle_web.war.sun-web.xml");
+ if(warResURL != null) {
+ getstatus_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+ }
+ archiveProcessor.processWebArchive(getstatus_jsp_vehicle_web, UserGetStatusClientJspTest.class, warResURL);
+
+
+ // Ear
+ EnterpriseArchive getstatus_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "getstatus_jsp_vehicle.ear");
+
+ // Any libraries added to the ear
+
+ // The component jars built by the package target
+ getstatus_jsp_vehicle_ear.addAsModule(getstatus_jsp_vehicle_web);
+
+
+
+ // // The application.xml descriptor
+ // URL earResURL = UserGetStatusClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/getstatus/");
+ // if(earResURL != null) {
+ // getstatus_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml");
+ // }
+ // // The sun-application.xml descriptor
+ // earResURL = UserGetStatusClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/getstatus/.ear.sun-application.xml");
+ // if(earResURL != null) {
+ // getstatus_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+ // }
+ // archiveProcessor.processEarArchive(getstatus_jsp_vehicle_ear, UserGetStatusClient.class, earResURL);
+
+ return getstatus_jsp_vehicle_ear;
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void testUserGetStatus001() throws java.lang.Exception {
+ super.testUserGetStatus001();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void testUserGetStatus002() throws java.lang.Exception {
+ super.testUserGetStatus002();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void testUserGetStatus003() throws java.lang.Exception {
+ super.testUserGetStatus003();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void testUserGetStatus004() throws java.lang.Exception {
+ super.testUserGetStatus004();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void testUserGetStatus005() throws java.lang.Exception {
+ super.testUserGetStatus005();
+ }
+
+
+}
\ No newline at end of file
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/UserGetStatusClientServletTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/UserGetStatusClientServletTest.java
new file mode 100644
index 0000000000..5ad825ae7c
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/UserGetStatusClientServletTest.java
@@ -0,0 +1,175 @@
+package com.sun.ts.tests.jta.ee.usertransaction.getstatus;
+
+import com.sun.ts.tests.jta.ee.usertransaction.getstatus.UserGetStatusClient;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+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.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+import java.lang.System.Logger;
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("jta")
+@Tag("platform")
+@Tag("web")
+@Tag("tck-javatest")
+
+public class UserGetStatusClientServletTest extends com.sun.ts.tests.jta.ee.usertransaction.getstatus.UserGetStatusClient {
+ static final String VEHICLE_ARCHIVE = "getstatus_servlet_vehicle";
+
+ private static String packagePath = UserGetStatusClientServletTest.class.getPackageName().replace(".", "/");
+
+ private static final Logger logger = System.getLogger(UserGetStatusClientServletTest.class.getName());
+
+ @BeforeEach
+ void logStartTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "STARTING TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ void logFinishTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "FINISHED TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ public void cleanup() {
+ logger.log(Logger.Level.INFO, "cleanup ok");
+ }
+
+ /**
+ EE10 Deployment Descriptors:
+ getstatus_ejb_vehicle:
+ getstatus_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+ getstatus_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ getstatus_jsp_vehicle:
+ getstatus_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+ getstatus_servlet_vehicle:
+ getstatus_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+ Found Descriptors:
+ War:
+
+ /com/sun/ts/tests/jta/ee/usertransaction/getstatus/servlet_vehicle_web.xml
+ /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+ Ear:
+
+ */
+ @TargetsContainer("tck-javatest")
+ @OverProtocol("javatest")
+ @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+ // War
+ // the war with the correct archive name
+ WebArchive getstatus_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "getstatus_servlet_vehicle_web.war");
+ // The class files
+ getstatus_servlet_vehicle_web.addClasses(
+ com.sun.ts.tests.jta.ee.usertransaction.getstatus.UserGetStatusClient.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.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,
+ UserGetStatusClientServletTest.class
+ );
+ // The web.xml descriptor
+ URL warResURL = UserGetStatusClientServletTest.class.getClassLoader().getResource(packagePath+"/servlet_vehicle_web.xml");
+ if(warResURL != null) {
+ getstatus_servlet_vehicle_web.setWebXML(warResURL);
+ }
+ // The sun-web.xml descriptor
+ warResURL = UserGetStatusClientServletTest.class.getClassLoader().getResource(packagePath+"/getstatus_servlet_vehicle_web.war.sun-web.xml");
+ if(warResURL != null) {
+ getstatus_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+ }
+ // Web content
+ archiveProcessor.processWebArchive(getstatus_servlet_vehicle_web, UserGetStatusClientServletTest.class, warResURL);
+
+ // Ear
+ EnterpriseArchive getstatus_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "getstatus_servlet_vehicle.ear");
+
+ // Any libraries added to the ear
+
+ // The component jars built by the package target
+ getstatus_servlet_vehicle_ear.addAsModule(getstatus_servlet_vehicle_web);
+
+
+
+ // // The application.xml descriptor
+ // URL earResURL = UserGetStatusClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/getstatus/");
+ // if(earResURL != null) {
+ // getstatus_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml");
+ // }
+ // // The sun-application.xml descriptor
+ // earResURL = UserGetStatusClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/getstatus/.ear.sun-application.xml");
+ // if(earResURL != null) {
+ // getstatus_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+ // }
+ // archiveProcessor.processEarArchive(getstatus_servlet_vehicle_ear, UserGetStatusClient.class, earResURL);
+
+ return getstatus_servlet_vehicle_ear;
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void testUserGetStatus001() throws java.lang.Exception {
+ super.testUserGetStatus001();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void testUserGetStatus002() throws java.lang.Exception {
+ super.testUserGetStatus002();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void testUserGetStatus003() throws java.lang.Exception {
+ super.testUserGetStatus003();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void testUserGetStatus004() throws java.lang.Exception {
+ super.testUserGetStatus004();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void testUserGetStatus005() throws java.lang.Exception {
+ super.testUserGetStatus005();
+ }
+
+
+}
\ No newline at end of file
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/UserRollbackClientEjbTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/UserRollbackClientEjbTest.java
new file mode 100644
index 0000000000..0687cad06c
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/UserRollbackClientEjbTest.java
@@ -0,0 +1,210 @@
+package com.sun.ts.tests.jta.ee.usertransaction.rollback;
+
+import com.sun.ts.tests.jta.ee.usertransaction.rollback.UserRollbackClient;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+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.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+import java.lang.System.Logger;
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("jta")
+@Tag("platform")
+@Tag("web")
+@Tag("tck-appclient")
+
+public class UserRollbackClientEjbTest extends com.sun.ts.tests.jta.ee.usertransaction.rollback.UserRollbackClient {
+ static final String VEHICLE_ARCHIVE = "rollback_ejb_vehicle";
+
+ private static String packagePath = UserRollbackClientEjbTest.class.getPackageName().replace(".", "/");
+
+ private static final Logger logger = System.getLogger(UserRollbackClientEjbTest.class.getName());
+
+ @BeforeEach
+ void logStartTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "STARTING TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ void logFinishTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "FINISHED TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ public void cleanup() {
+ logger.log(Logger.Level.INFO, "cleanup ok");
+ }
+
+ /**
+ EE10 Deployment Descriptors:
+ rollback_ejb_vehicle:
+ rollback_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+ rollback_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ rollback_jsp_vehicle:
+ rollback_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+ rollback_servlet_vehicle:
+ rollback_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+ Found Descriptors:
+ Client:
+
+ /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+ Ejb:
+
+ /com/sun/ts/tests/jta/ee/usertransaction/rollback/ejb_vehicle_ejb.xml
+ /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+ Ear:
+
+ */
+ @TargetsContainer("tck-appclient")
+ @OverProtocol("appclient")
+ @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+ // Client
+ // the jar with the correct archive name
+ JavaArchive rollback_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "rollback_ejb_vehicle_client.jar");
+ // The class files
+ rollback_ejb_vehicle_client.addClasses(
+ com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+ com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+ com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+ com.sun.ts.lib.harness.EETest.Fault.class,
+ com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+ com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+ com.sun.ts.lib.harness.EETest.class,
+ com.sun.ts.lib.harness.ServiceEETest.class,
+ com.sun.ts.lib.harness.EETest.SetupException.class,
+ com.sun.ts.tests.common.vehicle.VehicleClient.class,
+ UserRollbackClientEjbTest.class
+ );
+ // The application-client.xml descriptor
+ //TODO :replace display-name
+ URL resURL = UserRollbackClientEjbTest.class.getResource("/vehicle/ejb/ejb_vehicle_client.xml");
+ if(resURL != null) {
+ rollback_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+ }
+ // // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+ // resURL = UserRollbackClient.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml");
+ // if(resURL != null) {
+ // rollback_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+ // }
+ rollback_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + UserRollbackClientEjbTest.class.getName() + "\n"), "MANIFEST.MF");
+ archiveProcessor.processClientArchive(rollback_ejb_vehicle_client, UserRollbackClientEjbTest.class, resURL);
+
+
+ // Ejb
+ // the jar with the correct archive name
+ JavaArchive rollback_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "rollback_ejb_vehicle_ejb.jar");
+ // The class files
+ rollback_ejb_vehicle_ejb.addClasses(
+ 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.common.vehicle.ejb.EJBVehicle.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.common.vehicle.ejb.EJBVehicleRemote.class,
+ com.sun.ts.tests.jta.ee.common.InvalidStatusException.class,
+ com.sun.ts.tests.jta.ee.usertransaction.rollback.UserRollbackClient.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,
+ UserRollbackClientEjbTest.class
+ );
+ // The ejb-jar.xml descriptor
+ URL ejbResURL = UserRollbackClientEjbTest.class.getResource("/ejb_vehicle_ejb.xml");
+ if(ejbResURL != null) {
+ rollback_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
+ }
+ // The sun-ejb-jar.xml file
+ ejbResURL = UserRollbackClientEjbTest.class.getResource("/rollback_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+ if(ejbResURL != null) {
+ rollback_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
+ }
+ archiveProcessor.processEjbArchive(rollback_ejb_vehicle_ejb, UserRollbackClientEjbTest.class, ejbResURL);
+
+ // Ear
+ EnterpriseArchive rollback_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "rollback_ejb_vehicle.ear");
+
+ // Any libraries added to the ear
+
+ // The component jars built by the package target
+ rollback_ejb_vehicle_ear.addAsModule(rollback_ejb_vehicle_ejb);
+ rollback_ejb_vehicle_ear.addAsModule(rollback_ejb_vehicle_client);
+
+
+
+ // // The application.xml descriptor
+ // URL earResURL = UserRollbackClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/rollback/");
+ // if(earResURL != null) {
+ // rollback_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml");
+ // }
+ // The sun-application.xml descriptor
+ URL earResURL = UserRollbackClientEjbTest.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/rollback/rollback_ejb_vehicle_client.jar.sun-application-client");
+ if(earResURL != null) {
+ rollback_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+ }
+ archiveProcessor.processEarArchive(rollback_ejb_vehicle_ear, UserRollbackClientEjbTest.class, earResURL);
+ return rollback_ejb_vehicle_ear;
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void testUserRollback001() throws java.lang.Exception {
+ super.testUserRollback001();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void testUserRollback002() throws java.lang.Exception {
+ super.testUserRollback002();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void testUserRollback003() throws java.lang.Exception {
+ super.testUserRollback003();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void testUserRollback004() throws java.lang.Exception {
+ super.testUserRollback004();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void testUserRollback005() throws java.lang.Exception {
+ super.testUserRollback005();
+ }
+
+
+}
\ No newline at end of file
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/UserRollbackClientJspTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/UserRollbackClientJspTest.java
new file mode 100644
index 0000000000..8eeb97ac3f
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/UserRollbackClientJspTest.java
@@ -0,0 +1,180 @@
+package com.sun.ts.tests.jta.ee.usertransaction.rollback;
+
+import com.sun.ts.tests.jta.ee.usertransaction.rollback.UserRollbackClient;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+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.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+import java.lang.System.Logger;
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("jta")
+@Tag("platform")
+@Tag("web")
+@Tag("tck-javatest")
+
+public class UserRollbackClientJspTest extends com.sun.ts.tests.jta.ee.usertransaction.rollback.UserRollbackClient {
+ static final String VEHICLE_ARCHIVE = "rollback_jsp_vehicle";
+
+ private static String packagePath = UserRollbackClientJspTest.class.getPackageName().replace(".", "/");
+
+ private static final Logger logger = System.getLogger(UserRollbackClientJspTest.class.getName());
+
+ @BeforeEach
+ void logStartTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "STARTING TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ void logFinishTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "FINISHED TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ public void cleanup() {
+ logger.log(Logger.Level.INFO, "cleanup ok");
+ }
+
+ /**
+ EE10 Deployment Descriptors:
+ rollback_ejb_vehicle:
+ rollback_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+ rollback_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ rollback_jsp_vehicle:
+ rollback_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+ rollback_servlet_vehicle:
+ rollback_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+ Found Descriptors:
+ War:
+
+ /com/sun/ts/tests/jta/ee/usertransaction/rollback/jsp_vehicle_web.xml
+ /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+ Ear:
+
+ */
+ @TargetsContainer("tck-javatest")
+ @OverProtocol("javatest")
+ @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+ // War
+ // the war with the correct archive name
+ WebArchive rollback_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "rollback_jsp_vehicle_web.war");
+ // The class files
+ rollback_jsp_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.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.usertransaction.rollback.UserRollbackClient.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,
+ UserRollbackClientJspTest.class
+ );
+ // The web.xml descriptor
+ URL warResURL = UserRollbackClientJspTest.class.getClassLoader().getResource(packagePath+"/jsp_vehicle_web.xml");
+ if(warResURL != null) {
+ rollback_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+ }
+ // Web content
+ warResURL = UserRollbackClientJspTest.class.getResource("/vehicle/jsp/contentRoot/client.html");
+ rollback_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+ warResURL = UserRollbackClientJspTest.class.getResource("/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+ rollback_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+
+ // The sun-web.xml descriptor
+ warResURL = UserRollbackClientJspTest.class.getClassLoader().getResource(packagePath+"/rollback_jsp_vehicle_web.war.sun-web.xml");
+ if(warResURL != null) {
+ rollback_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+ }
+ archiveProcessor.processWebArchive(rollback_jsp_vehicle_web, UserRollbackClientJspTest.class, warResURL);
+
+
+ // Ear
+ EnterpriseArchive rollback_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "rollback_jsp_vehicle.ear");
+
+ // Any libraries added to the ear
+
+ // The component jars built by the package target
+ rollback_jsp_vehicle_ear.addAsModule(rollback_jsp_vehicle_web);
+
+
+
+ // // The application.xml descriptor
+ // URL earResURL = UserRollbackClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/rollback/");
+ // if(earResURL != null) {
+ // rollback_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml");
+ // }
+ // // The sun-application.xml descriptor
+ // earResURL = UserRollbackClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/rollback/.ear.sun-application.xml");
+ // if(earResURL != null) {
+ // rollback_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+ // }
+ // archiveProcessor.processEarArchive(rollback_jsp_vehicle_ear, UserRollbackClient.class, earResURL);
+
+ return rollback_jsp_vehicle_ear;
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void testUserRollback001() throws java.lang.Exception {
+ super.testUserRollback001();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void testUserRollback002() throws java.lang.Exception {
+ super.testUserRollback002();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void testUserRollback003() throws java.lang.Exception {
+ super.testUserRollback003();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void testUserRollback004() throws java.lang.Exception {
+ super.testUserRollback004();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void testUserRollback005() throws java.lang.Exception {
+ super.testUserRollback005();
+ }
+
+
+}
\ No newline at end of file
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/UserRollbackClientServletTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/UserRollbackClientServletTest.java
new file mode 100644
index 0000000000..66eeef34bf
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/UserRollbackClientServletTest.java
@@ -0,0 +1,175 @@
+package com.sun.ts.tests.jta.ee.usertransaction.rollback;
+
+import com.sun.ts.tests.jta.ee.usertransaction.rollback.UserRollbackClient;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+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.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+import java.lang.System.Logger;
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("jta")
+@Tag("platform")
+@Tag("web")
+@Tag("tck-javatest")
+
+public class UserRollbackClientServletTest extends com.sun.ts.tests.jta.ee.usertransaction.rollback.UserRollbackClient {
+ static final String VEHICLE_ARCHIVE = "rollback_servlet_vehicle";
+
+ private static String packagePath = UserRollbackClientServletTest.class.getPackageName().replace(".", "/");
+
+ private static final Logger logger = System.getLogger(UserRollbackClientServletTest.class.getName());
+
+ @BeforeEach
+ void logStartTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "STARTING TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ void logFinishTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "FINISHED TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ public void cleanup() {
+ logger.log(Logger.Level.INFO, "cleanup ok");
+ }
+
+ /**
+ EE10 Deployment Descriptors:
+ rollback_ejb_vehicle:
+ rollback_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+ rollback_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ rollback_jsp_vehicle:
+ rollback_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+ rollback_servlet_vehicle:
+ rollback_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+ Found Descriptors:
+ War:
+
+ /com/sun/ts/tests/jta/ee/usertransaction/rollback/servlet_vehicle_web.xml
+ /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+ Ear:
+
+ */
+ @TargetsContainer("tck-javatest")
+ @OverProtocol("javatest")
+ @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+ // War
+ // the war with the correct archive name
+ WebArchive rollback_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "rollback_servlet_vehicle_web.war");
+ // The class files
+ rollback_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.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.usertransaction.rollback.UserRollbackClient.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,
+ UserRollbackClientServletTest.class
+ );
+ // The web.xml descriptor
+ URL warResURL = UserRollbackClientServletTest.class.getClassLoader().getResource(packagePath+"/servlet_vehicle_web.xml");
+ if(warResURL != null) {
+ rollback_servlet_vehicle_web.setWebXML(warResURL);
+ }
+ // The sun-web.xml descriptor
+ warResURL = UserRollbackClientServletTest.class.getClassLoader().getResource(packagePath+"/rollback_servlet_vehicle_web.war.sun-web.xml");
+ if(warResURL != null) {
+ rollback_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+ }
+ // Web content
+ archiveProcessor.processWebArchive(rollback_servlet_vehicle_web, UserRollbackClientServletTest.class, warResURL);
+
+ // Ear
+ EnterpriseArchive rollback_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "rollback_servlet_vehicle.ear");
+
+ // Any libraries added to the ear
+
+ // The component jars built by the package target
+ rollback_servlet_vehicle_ear.addAsModule(rollback_servlet_vehicle_web);
+
+
+
+ // // The application.xml descriptor
+ // URL earResURL = UserRollbackClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/rollback/");
+ // if(earResURL != null) {
+ // rollback_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml");
+ // }
+ // // The sun-application.xml descriptor
+ // earResURL = UserRollbackClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/rollback/.ear.sun-application.xml");
+ // if(earResURL != null) {
+ // rollback_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+ // }
+ // archiveProcessor.processEarArchive(rollback_servlet_vehicle_ear, UserRollbackClient.class, earResURL);
+
+ return rollback_servlet_vehicle_ear;
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void testUserRollback001() throws java.lang.Exception {
+ super.testUserRollback001();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void testUserRollback002() throws java.lang.Exception {
+ super.testUserRollback002();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void testUserRollback003() throws java.lang.Exception {
+ super.testUserRollback003();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void testUserRollback004() throws java.lang.Exception {
+ super.testUserRollback004();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void testUserRollback005() throws java.lang.Exception {
+ super.testUserRollback005();
+ }
+
+
+}
\ No newline at end of file
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/UserSetRollbackOnlyClientEjbTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/UserSetRollbackOnlyClientEjbTest.java
new file mode 100644
index 0000000000..713d1e1b34
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/UserSetRollbackOnlyClientEjbTest.java
@@ -0,0 +1,203 @@
+package com.sun.ts.tests.jta.ee.usertransaction.setrollbackonly;
+
+import com.sun.ts.tests.jta.ee.usertransaction.setrollbackonly.UserSetRollbackOnlyClient;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+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.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+import java.lang.System.Logger;
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("jta")
+@Tag("platform")
+@Tag("web")
+@Tag("tck-appclient")
+
+public class UserSetRollbackOnlyClientEjbTest extends com.sun.ts.tests.jta.ee.usertransaction.setrollbackonly.UserSetRollbackOnlyClient {
+ static final String VEHICLE_ARCHIVE = "setrollbackonly_ejb_vehicle";
+
+ private static String packagePath = UserSetRollbackOnlyClientEjbTest.class.getPackageName().replace(".", "/");
+
+ private static final Logger logger = System.getLogger(UserSetRollbackOnlyClientEjbTest.class.getName());
+
+ @BeforeEach
+ void logStartTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "STARTING TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ void logFinishTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "FINISHED TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ public void cleanup() {
+ logger.log(Logger.Level.INFO, "cleanup ok");
+ }
+
+ /**
+ EE10 Deployment Descriptors:
+ setrollbackonly_ejb_vehicle:
+ setrollbackonly_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+ setrollbackonly_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ setrollbackonly_jsp_vehicle:
+ setrollbackonly_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+ setrollbackonly_servlet_vehicle:
+ setrollbackonly_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+ Found Descriptors:
+ Client:
+
+ /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+ Ejb:
+
+ /com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/ejb_vehicle_ejb.xml
+ /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+ Ear:
+
+ */
+ @TargetsContainer("tck-appclient")
+ @OverProtocol("appclient")
+ @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+ // Client
+ // the jar with the correct archive name
+ JavaArchive setrollbackonly_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "setrollbackonly_ejb_vehicle_client.jar");
+ // The class files
+ setrollbackonly_ejb_vehicle_client.addClasses(
+ com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+ com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+ com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+ com.sun.ts.lib.harness.EETest.Fault.class,
+ com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+ com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+ com.sun.ts.lib.harness.EETest.class,
+ com.sun.ts.lib.harness.ServiceEETest.class,
+ com.sun.ts.lib.harness.EETest.SetupException.class,
+ com.sun.ts.tests.common.vehicle.VehicleClient.class,
+ UserSetRollbackOnlyClientEjbTest.class
+ );
+ // The application-client.xml descriptor
+ // TODO: replace display-name
+ URL resURL = UserSetRollbackOnlyClientEjbTest.class.getResource("/vehicle/ejb/ejb_vehicle_client.xml");
+ if(resURL != null) {
+ setrollbackonly_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+ }
+ // // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+ // resURL = UserSetRollbackOnlyClient.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml");
+ // if(resURL != null) {
+ // setrollbackonly_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+ // }
+ setrollbackonly_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + UserSetRollbackOnlyClientEjbTest.class.getName() + "\n"), "MANIFEST.MF");
+ archiveProcessor.processClientArchive(setrollbackonly_ejb_vehicle_client, UserSetRollbackOnlyClientEjbTest.class, resURL);
+
+
+ // Ejb
+ // the jar with the correct archive name
+ JavaArchive setrollbackonly_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "setrollbackonly_ejb_vehicle_ejb.jar");
+ // The class files
+ setrollbackonly_ejb_vehicle_ejb.addClasses(
+ 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.common.vehicle.ejb.EJBVehicle.class,
+ com.sun.ts.tests.jta.ee.common.InitFailedException.class,
+ com.sun.ts.tests.jta.ee.common.TransactionStatus.class,
+ com.sun.ts.tests.jta.ee.usertransaction.setrollbackonly.UserSetRollbackOnlyClient.class,
+ com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+ com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.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,
+ UserSetRollbackOnlyClientEjbTest.class
+ );
+ // The ejb-jar.xml descriptor
+ URL ejbResURL = UserSetRollbackOnlyClientEjbTest.class.getResource("/ejb_vehicle_ejb.xml");
+ if(ejbResURL != null) {
+ setrollbackonly_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
+ }
+ // The sun-ejb-jar.xml file
+ ejbResURL = UserSetRollbackOnlyClientEjbTest.class.getResource("/setrollbackonly_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+ if(ejbResURL != null) {
+ setrollbackonly_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
+ }
+ archiveProcessor.processEjbArchive(setrollbackonly_ejb_vehicle_ejb, UserSetRollbackOnlyClientEjbTest.class, ejbResURL);
+
+ // Ear
+ EnterpriseArchive setrollbackonly_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "setrollbackonly_ejb_vehicle.ear");
+
+ // Any libraries added to the ear
+
+ // The component jars built by the package target
+ setrollbackonly_ejb_vehicle_ear.addAsModule(setrollbackonly_ejb_vehicle_ejb);
+ setrollbackonly_ejb_vehicle_ear.addAsModule(setrollbackonly_ejb_vehicle_client);
+
+
+
+ // // The application.xml descriptor
+ // URL earResURL = UserSetRollbackOnlyClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/");
+ // if(earResURL != null) {
+ // setrollbackonly_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml");
+ // }
+ // The sun-application.xml descriptor
+ URL earResURL = UserSetRollbackOnlyClientEjbTest.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/setrollbackonly_ejb_vehicle_client.jar.sun-application-client.xml");
+ if(earResURL != null) {
+ setrollbackonly_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+ }
+ archiveProcessor.processEarArchive(setrollbackonly_ejb_vehicle_ear, UserSetRollbackOnlyClientEjbTest.class, earResURL);
+ return setrollbackonly_ejb_vehicle_ear;
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void testUserSetRollbackOnly001() throws java.lang.Exception {
+ super.testUserSetRollbackOnly001();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void testUserSetRollbackOnly002() throws java.lang.Exception {
+ super.testUserSetRollbackOnly002();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void testUserSetRollbackOnly003() throws java.lang.Exception {
+ super.testUserSetRollbackOnly003();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void testUserSetRollbackOnly004() throws java.lang.Exception {
+ super.testUserSetRollbackOnly004();
+ }
+
+
+}
\ No newline at end of file
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/UserSetRollbackOnlyClientJspTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/UserSetRollbackOnlyClientJspTest.java
new file mode 100644
index 0000000000..1c90c0fa47
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/UserSetRollbackOnlyClientJspTest.java
@@ -0,0 +1,172 @@
+package com.sun.ts.tests.jta.ee.usertransaction.setrollbackonly;
+
+import com.sun.ts.tests.jta.ee.usertransaction.setrollbackonly.UserSetRollbackOnlyClient;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+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.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+import java.lang.System.Logger;
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("jta")
+@Tag("platform")
+@Tag("web")
+@Tag("tck-javatest")
+
+public class UserSetRollbackOnlyClientJspTest extends com.sun.ts.tests.jta.ee.usertransaction.setrollbackonly.UserSetRollbackOnlyClient {
+ static final String VEHICLE_ARCHIVE = "setrollbackonly_jsp_vehicle";
+
+ private static String packagePath = UserSetRollbackOnlyClientJspTest.class.getPackageName().replace(".", "/");
+
+ private static final Logger logger = System.getLogger(UserSetRollbackOnlyClientJspTest.class.getName());
+
+ @BeforeEach
+ void logStartTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "STARTING TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ void logFinishTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "FINISHED TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ public void cleanup() {
+ logger.log(Logger.Level.INFO, "cleanup ok");
+ }
+
+ /**
+ EE10 Deployment Descriptors:
+ setrollbackonly_ejb_vehicle:
+ setrollbackonly_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+ setrollbackonly_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ setrollbackonly_jsp_vehicle:
+ setrollbackonly_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+ setrollbackonly_servlet_vehicle:
+ setrollbackonly_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+ Found Descriptors:
+ War:
+
+ /com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/jsp_vehicle_web.xml
+ /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+ Ear:
+
+ */
+ @TargetsContainer("tck-javatest")
+ @OverProtocol("javatest")
+ @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+ // War
+ // the war with the correct archive name
+ WebArchive setrollbackonly_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "setrollbackonly_jsp_vehicle_web.war");
+ // The class files
+ setrollbackonly_jsp_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.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.jta.ee.usertransaction.setrollbackonly.UserSetRollbackOnlyClient.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,
+ UserSetRollbackOnlyClientJspTest.class
+ );
+ // The web.xml descriptor
+ URL warResURL = UserSetRollbackOnlyClientJspTest.class.getClassLoader().getResource(packagePath+"/jsp_vehicle_web.xml");
+ if(warResURL != null) {
+ setrollbackonly_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+ }
+ // Web content
+ warResURL = UserSetRollbackOnlyClientJspTest.class.getResource("/vehicle/jsp/contentRoot/client.html");
+ setrollbackonly_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+ warResURL = UserSetRollbackOnlyClientJspTest.class.getResource("/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+ setrollbackonly_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+
+ // The sun-web.xml descriptor
+ warResURL = UserSetRollbackOnlyClientJspTest.class.getClassLoader().getResource(packagePath+"/setrollbackonly_jsp_vehicle_web.war.sun-web.xml");
+ if(warResURL != null) {
+ setrollbackonly_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+ }
+ archiveProcessor.processWebArchive(setrollbackonly_jsp_vehicle_web, UserSetRollbackOnlyClientJspTest.class, warResURL);
+
+ // Ear
+ EnterpriseArchive setrollbackonly_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "setrollbackonly_jsp_vehicle.ear");
+
+ // Any libraries added to the ear
+
+ // The component jars built by the package target
+ setrollbackonly_jsp_vehicle_ear.addAsModule(setrollbackonly_jsp_vehicle_web);
+
+
+
+ // // The application.xml descriptor
+ // URL earResURL = UserSetRollbackOnlyClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/");
+ // if(earResURL != null) {
+ // setrollbackonly_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml");
+ // }
+ // // The sun-application.xml descriptor
+ // earResURL = UserSetRollbackOnlyClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/.ear.sun-application.xml");
+ // if(earResURL != null) {
+ // setrollbackonly_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+ // }
+ // archiveProcessor.processEarArchive(setrollbackonly_jsp_vehicle_ear, UserSetRollbackOnlyClient.class, earResURL);
+
+ return setrollbackonly_jsp_vehicle_ear;
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void testUserSetRollbackOnly001() throws java.lang.Exception {
+ super.testUserSetRollbackOnly001();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void testUserSetRollbackOnly002() throws java.lang.Exception {
+ super.testUserSetRollbackOnly002();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void testUserSetRollbackOnly003() throws java.lang.Exception {
+ super.testUserSetRollbackOnly003();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void testUserSetRollbackOnly004() throws java.lang.Exception {
+ super.testUserSetRollbackOnly004();
+ }
+
+
+}
\ No newline at end of file
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/UserSetRollbackOnlyClientServletTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/UserSetRollbackOnlyClientServletTest.java
new file mode 100644
index 0000000000..e517cc2fea
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/UserSetRollbackOnlyClientServletTest.java
@@ -0,0 +1,168 @@
+package com.sun.ts.tests.jta.ee.usertransaction.setrollbackonly;
+
+import com.sun.ts.tests.jta.ee.usertransaction.setrollbackonly.UserSetRollbackOnlyClient;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+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.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+import java.lang.System.Logger;
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("jta")
+@Tag("platform")
+@Tag("web")
+@Tag("tck-javatest")
+
+public class UserSetRollbackOnlyClientServletTest extends com.sun.ts.tests.jta.ee.usertransaction.setrollbackonly.UserSetRollbackOnlyClient {
+ static final String VEHICLE_ARCHIVE = "setrollbackonly_servlet_vehicle";
+
+ private static String packagePath = UserSetRollbackOnlyClientServletTest.class.getPackageName().replace(".", "/");
+
+ private static final Logger logger = System.getLogger(UserSetRollbackOnlyClientServletTest.class.getName());
+
+ @BeforeEach
+ void logStartTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "STARTING TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ void logFinishTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "FINISHED TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ public void cleanup() {
+ logger.log(Logger.Level.INFO, "cleanup ok");
+ }
+
+ /**
+ EE10 Deployment Descriptors:
+ setrollbackonly_ejb_vehicle:
+ setrollbackonly_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+ setrollbackonly_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ setrollbackonly_jsp_vehicle:
+ setrollbackonly_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+ setrollbackonly_servlet_vehicle:
+ setrollbackonly_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+ Found Descriptors:
+ War:
+
+ /com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/servlet_vehicle_web.xml
+ /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+ Ear:
+
+ */
+ @TargetsContainer("tck-javatest")
+ @OverProtocol("javatest")
+ @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+ // War
+ // the war with the correct archive name
+ WebArchive setrollbackonly_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "setrollbackonly_servlet_vehicle_web.war");
+ // The class files
+ setrollbackonly_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.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.setrollbackonly.UserSetRollbackOnlyClient.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,
+ UserSetRollbackOnlyClientServletTest.class
+ );
+ // The web.xml descriptor
+ URL warResURL = UserSetRollbackOnlyClientServletTest.class.getClassLoader().getResource(packagePath+"/servlet_vehicle_web.xml");
+ if(warResURL != null) {
+ setrollbackonly_servlet_vehicle_web.setWebXML(warResURL);
+ }
+ // The sun-web.xml descriptor
+ warResURL = UserSetRollbackOnlyClientServletTest.class.getClassLoader().getResource(packagePath+"/setrollbackonly_servlet_vehicle_web.war.sun-web.xml");
+ if(warResURL != null) {
+ setrollbackonly_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+ }
+ // Web content
+ archiveProcessor.processWebArchive(setrollbackonly_servlet_vehicle_web, UserSetRollbackOnlyClientServletTest.class, warResURL);
+
+ // Ear
+ EnterpriseArchive setrollbackonly_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "setrollbackonly_servlet_vehicle.ear");
+
+ // Any libraries added to the ear
+
+ // The component jars built by the package target
+ setrollbackonly_servlet_vehicle_ear.addAsModule(setrollbackonly_servlet_vehicle_web);
+
+
+
+ // // The application.xml descriptor
+ // URL earResURL = UserSetRollbackOnlyClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/");
+ // if(earResURL != null) {
+ // setrollbackonly_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml");
+ // }
+ // // The sun-application.xml descriptor
+ // earResURL = UserSetRollbackOnlyClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/.ear.sun-application.xml");
+ // if(earResURL != null) {
+ // setrollbackonly_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+ // }
+ // archiveProcessor.processEarArchive(setrollbackonly_servlet_vehicle_ear, UserSetRollbackOnlyClient.class, earResURL);
+
+ return setrollbackonly_servlet_vehicle_ear;
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void testUserSetRollbackOnly001() throws java.lang.Exception {
+ super.testUserSetRollbackOnly001();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void testUserSetRollbackOnly002() throws java.lang.Exception {
+ super.testUserSetRollbackOnly002();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void testUserSetRollbackOnly003() throws java.lang.Exception {
+ super.testUserSetRollbackOnly003();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void testUserSetRollbackOnly004() throws java.lang.Exception {
+ super.testUserSetRollbackOnly004();
+ }
+
+
+}
\ No newline at end of file
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/jsp_vehicle_web.xml b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/jsp_vehicle_web.xml
deleted file mode 100644
index af54232b7e..0000000000
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/jsp_vehicle_web.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
- jsp_vehicle
-
- jsp_vehicle
- /jsp_vehicle.jsp
- 0
-
-
- 54
-
-
- jdbc/DB1
- javax.sql.DataSource
- Container
- Shareable
-
-
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/servlet_vehicle_web.xml b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/servlet_vehicle_web.xml
deleted file mode 100644
index e6178bc18a..0000000000
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/servlet_vehicle_web.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
- servlet_vehicle
-
- Servlet_VehicleLogicalName
- com.sun.ts.tests.common.vehicle.servlet.ServletVehicle
-
-
- Servlet_VehicleLogicalName
- /servlet_vehicle
-
-
- 54
-
-
- jdbc/DB1
- javax.sql.DataSource
- Container
- Shareable
-
-
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/UserSetTransactionTimeoutClientEjbTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/UserSetTransactionTimeoutClientEjbTest.java
new file mode 100644
index 0000000000..154d00a1f5
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/UserSetTransactionTimeoutClientEjbTest.java
@@ -0,0 +1,188 @@
+package com.sun.ts.tests.jta.ee.usertransaction.settransactiontimeout;
+
+import com.sun.ts.tests.jta.ee.usertransaction.settransactiontimeout.UserSetTransactionTimeoutClient;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+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.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+import java.lang.System.Logger;
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("jta")
+@Tag("platform")
+@Tag("web")
+@Tag("tck-appclient")
+
+public class UserSetTransactionTimeoutClientEjbTest extends com.sun.ts.tests.jta.ee.usertransaction.settransactiontimeout.UserSetTransactionTimeoutClient {
+ static final String VEHICLE_ARCHIVE = "settransactiontimeout_ejb_vehicle";
+
+ private static String packagePath = UserSetTransactionTimeoutClientEjbTest.class.getPackageName().replace(".", "/");
+
+ private static final Logger logger = System.getLogger(UserSetTransactionTimeoutClientEjbTest.class.getName());
+
+ @BeforeEach
+ void logStartTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "STARTING TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ void logFinishTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "FINISHED TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ public void cleanup() {
+ logger.log(Logger.Level.INFO, "cleanup ok");
+ }
+
+ /**
+ EE10 Deployment Descriptors:
+ settransactiontimeout_ejb_vehicle:
+ settransactiontimeout_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+ settransactiontimeout_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ settransactiontimeout_jsp_vehicle:
+ settransactiontimeout_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+ settransactiontimeout_servlet_vehicle:
+ settransactiontimeout_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+ Found Descriptors:
+ Client:
+
+ /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+ Ejb:
+
+ /com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/ejb_vehicle_ejb.xml
+ /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+ Ear:
+
+ */
+ @TargetsContainer("tck-appclient")
+ @OverProtocol("appclient")
+ @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+ // Client
+ // the jar with the correct archive name
+ JavaArchive settransactiontimeout_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "settransactiontimeout_ejb_vehicle_client.jar");
+ // The class files
+ settransactiontimeout_ejb_vehicle_client.addClasses(
+ com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+ com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+ com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+ com.sun.ts.lib.harness.EETest.Fault.class,
+ com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+ com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+ com.sun.ts.lib.harness.EETest.class,
+ com.sun.ts.lib.harness.ServiceEETest.class,
+ com.sun.ts.lib.harness.EETest.SetupException.class,
+ com.sun.ts.tests.common.vehicle.VehicleClient.class
+ );
+ // The application-client.xml descriptor
+ // TODO change client name
+ URL resURL = UserSetTransactionTimeoutClientEjbTest.class.getResource("/vehicle/ejb/ejb_vehicle_client.xml");
+ if(resURL != null) {
+ settransactiontimeout_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+ }
+ // // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+ // resURL = UserSetTransactionTimeoutClient.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml");
+ // if(resURL != null) {
+ // settransactiontimeout_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+ // }
+ settransactiontimeout_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + UserSetTransactionTimeoutClientEjbTest.class.getName() + "\n"), "MANIFEST.MF");
+ archiveProcessor.processClientArchive(settransactiontimeout_ejb_vehicle_client, UserSetTransactionTimeoutClientEjbTest.class, resURL);
+
+
+ // Ejb
+ // the jar with the correct archive name
+ JavaArchive settransactiontimeout_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "settransactiontimeout_ejb_vehicle_ejb.jar");
+ // The class files
+ settransactiontimeout_ejb_vehicle_ejb.addClasses(
+ 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.usertransaction.settransactiontimeout.UserSetTransactionTimeoutClient.class,
+ com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.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.common.vehicle.ejb.EJBVehicleRemote.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,
+ UserSetTransactionTimeoutClientEjbTest.class
+ );
+ // The ejb-jar.xml descriptor
+ URL ejbResURL = UserSetTransactionTimeoutClientEjbTest.class.getResource("/ejb_vehicle_ejb.xml");
+ if(ejbResURL != null) {
+ settransactiontimeout_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
+ }
+ // The sun-ejb-jar.xml file
+ ejbResURL = UserSetTransactionTimeoutClientEjbTest.class.getResource("/settransactiontimeout_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+ if(ejbResURL != null) {
+ settransactiontimeout_ejb_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
+ }
+ archiveProcessor.processEjbArchive(settransactiontimeout_ejb_vehicle_ejb, UserSetTransactionTimeoutClientEjbTest.class, ejbResURL);
+
+ // Ear
+ EnterpriseArchive settransactiontimeout_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "settransactiontimeout_ejb_vehicle.ear");
+
+ // Any libraries added to the ear
+
+ // The component jars built by the package target
+ settransactiontimeout_ejb_vehicle_ear.addAsModule(settransactiontimeout_ejb_vehicle_ejb);
+ settransactiontimeout_ejb_vehicle_ear.addAsModule(settransactiontimeout_ejb_vehicle_client);
+
+
+ // // The application.xml descriptor
+ // URL earResURL = UserSetTransactionTimeoutClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/");
+ // if(earResURL != null) {
+ // settransactiontimeout_ejb_vehicle_ear.addAsManifestResource(earResURL, "application.xml");
+ // }
+ // The sun-application.xml descriptor
+ URL earResURL = UserSetTransactionTimeoutClientEjbTest.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/settransactiontimeout_ejb_vehicle_client.jar.sun-application-client.xml");
+ if(earResURL != null) {
+ settransactiontimeout_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+ }
+ archiveProcessor.processEarArchive(settransactiontimeout_ejb_vehicle_ear, UserSetTransactionTimeoutClientEjbTest.class, earResURL);
+
+ return settransactiontimeout_ejb_vehicle_ear;
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void testUserSetTransactionTimeout001() throws java.lang.Exception {
+ super.testUserSetTransactionTimeout001();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("ejb")
+ public void testUserSetTransactionTimeout002() throws java.lang.Exception {
+ super.testUserSetTransactionTimeout002();
+ }
+
+
+}
\ No newline at end of file
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/UserSetTransactionTimeoutClientJspTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/UserSetTransactionTimeoutClientJspTest.java
new file mode 100644
index 0000000000..ffb3e56b38
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/UserSetTransactionTimeoutClientJspTest.java
@@ -0,0 +1,159 @@
+package com.sun.ts.tests.jta.ee.usertransaction.settransactiontimeout;
+
+import com.sun.ts.tests.jta.ee.usertransaction.settransactiontimeout.UserSetTransactionTimeoutClient;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+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.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+import java.lang.System.Logger;
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("jta")
+@Tag("platform")
+@Tag("web")
+@Tag("tck-javatest")
+
+public class UserSetTransactionTimeoutClientJspTest extends com.sun.ts.tests.jta.ee.usertransaction.settransactiontimeout.UserSetTransactionTimeoutClient {
+ static final String VEHICLE_ARCHIVE = "settransactiontimeout_jsp_vehicle";
+
+ private static String packagePath = UserSetTransactionTimeoutClientJspTest.class.getPackageName().replace(".", "/");
+
+ private static final Logger logger = System.getLogger(UserSetTransactionTimeoutClientJspTest.class.getName());
+
+ @BeforeEach
+ void logStartTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "STARTING TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ void logFinishTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "FINISHED TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ public void cleanup() {
+ logger.log(Logger.Level.INFO, "cleanup ok");
+ }
+
+ /**
+ EE10 Deployment Descriptors:
+ settransactiontimeout_ejb_vehicle:
+ settransactiontimeout_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+ settransactiontimeout_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ settransactiontimeout_jsp_vehicle:
+ settransactiontimeout_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+ settransactiontimeout_servlet_vehicle:
+ settransactiontimeout_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+ Found Descriptors:
+ War:
+
+ /com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/jsp_vehicle_web.xml
+ /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+ Ear:
+
+ */
+ @TargetsContainer("tck-javatest")
+ @OverProtocol("javatest")
+ @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+ // War
+ // the war with the correct archive name
+ WebArchive settransactiontimeout_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "settransactiontimeout_jsp_vehicle_web.war");
+ // The class files
+ settransactiontimeout_jsp_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.common.Transact.class,
+ com.sun.ts.tests.jta.ee.common.InvalidStatusException.class,
+ com.sun.ts.tests.jta.ee.usertransaction.settransactiontimeout.UserSetTransactionTimeoutClient.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.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,
+ UserSetTransactionTimeoutClientJspTest.class
+ );
+ // The web.xml descriptor
+ URL warResURL = UserSetTransactionTimeoutClientJspTest.class.getClassLoader().getResource(packagePath+"/jsp_vehicle_web.xml");
+ if(warResURL != null) {
+ settransactiontimeout_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+ }
+ // Web content
+ warResURL = UserSetTransactionTimeoutClientJspTest.class.getResource("/vehicle/jsp/contentRoot/client.html");
+ settransactiontimeout_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+ warResURL = UserSetTransactionTimeoutClientJspTest.class.getResource("/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+ settransactiontimeout_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+
+ // The sun-web.xml descriptor
+ warResURL = UserSetTransactionTimeoutClientJspTest.class.getClassLoader().getResource(packagePath+"/settransactiontimeout_jsp_vehicle_web.war.sun-web.xml");
+ if(warResURL != null) {
+ settransactiontimeout_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+ }
+
+ archiveProcessor.processWebArchive(settransactiontimeout_jsp_vehicle_web, UserSetTransactionTimeoutClientJspTest.class, warResURL);
+
+ // Ear
+ EnterpriseArchive settransactiontimeout_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "settransactiontimeout_jsp_vehicle.ear");
+
+ // Any libraries added to the ear
+
+ // The component jars built by the package target
+ settransactiontimeout_jsp_vehicle_ear.addAsModule(settransactiontimeout_jsp_vehicle_web);
+
+
+
+ // // The application.xml descriptor
+ // URL earResURL = UserSetTransactionTimeoutClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/");
+ // if(earResURL != null) {
+ // settransactiontimeout_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml");
+ // }
+ // // The sun-application.xml descriptor
+ // earResURL = UserSetTransactionTimeoutClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/.ear.sun-application.xml");
+ // if(earResURL != null) {
+ // settransactiontimeout_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+ // }
+ // archiveProcessor.processEarArchive(settransactiontimeout_jsp_vehicle_ear, UserSetTransactionTimeoutClient.class, earResURL);
+
+ return settransactiontimeout_jsp_vehicle_ear;
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void testUserSetTransactionTimeout001() throws java.lang.Exception {
+ super.testUserSetTransactionTimeout001();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("jsp")
+ public void testUserSetTransactionTimeout002() throws java.lang.Exception {
+ super.testUserSetTransactionTimeout002();
+ }
+
+
+}
\ No newline at end of file
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/UserSetTransactionTimeoutClientServletTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/UserSetTransactionTimeoutClientServletTest.java
new file mode 100644
index 0000000000..f0b1cbaebd
--- /dev/null
+++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/UserSetTransactionTimeoutClientServletTest.java
@@ -0,0 +1,154 @@
+package com.sun.ts.tests.jta.ee.usertransaction.settransactiontimeout;
+
+import com.sun.ts.tests.jta.ee.usertransaction.settransactiontimeout.UserSetTransactionTimeoutClient;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+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.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+import java.lang.System.Logger;
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("jta")
+@Tag("platform")
+@Tag("web")
+@Tag("tck-javatest")
+
+public class UserSetTransactionTimeoutClientServletTest extends com.sun.ts.tests.jta.ee.usertransaction.settransactiontimeout.UserSetTransactionTimeoutClient {
+ static final String VEHICLE_ARCHIVE = "settransactiontimeout_servlet_vehicle";
+
+ private static String packagePath = UserSetTransactionTimeoutClientServletTest.class.getPackageName().replace(".", "/");
+
+ private static final Logger logger = System.getLogger(UserSetTransactionTimeoutClientServletTest.class.getName());
+
+ @BeforeEach
+ void logStartTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "STARTING TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ void logFinishTest(TestInfo testInfo) {
+ logger.log(Logger.Level.INFO, "FINISHED TEST : " + testInfo.getDisplayName());
+ }
+
+ @AfterEach
+ public void cleanup() {
+ logger.log(Logger.Level.INFO, "cleanup ok");
+ }
+
+ /**
+ EE10 Deployment Descriptors:
+ settransactiontimeout_ejb_vehicle:
+ settransactiontimeout_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+ settransactiontimeout_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+ settransactiontimeout_jsp_vehicle:
+ settransactiontimeout_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+ settransactiontimeout_servlet_vehicle:
+ settransactiontimeout_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+ Found Descriptors:
+ War:
+
+ /com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/servlet_vehicle_web.xml
+ /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+ Ear:
+
+ */
+ @TargetsContainer("tck-javatest")
+ @OverProtocol("javatest")
+ @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+ // War
+ // the war with the correct archive name
+ WebArchive settransactiontimeout_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "settransactiontimeout_servlet_vehicle_web.war");
+ // The class files
+ settransactiontimeout_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.common.Transact.class,
+ com.sun.ts.tests.jta.ee.common.InvalidStatusException.class,
+ com.sun.ts.tests.jta.ee.usertransaction.settransactiontimeout.UserSetTransactionTimeoutClient.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,
+ UserSetTransactionTimeoutClientServletTest.class
+ );
+ // The web.xml descriptor
+ URL warResURL = UserSetTransactionTimeoutClientServletTest.class.getClassLoader().getResource(packagePath+"/servlet_vehicle_web.xml");
+ if(warResURL != null) {
+ settransactiontimeout_servlet_vehicle_web.setWebXML(warResURL);
+ }
+ // The sun-web.xml descriptor
+ warResURL = UserSetTransactionTimeoutClientServletTest.class.getClassLoader().getResource(packagePath+"/settransactiontimeout_servlet_vehicle_web.war.sun-web.xml");
+ if(warResURL != null) {
+ settransactiontimeout_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+ }
+ // Web content
+ archiveProcessor.processWebArchive(settransactiontimeout_servlet_vehicle_web, UserSetTransactionTimeoutClientServletTest.class, warResURL);
+
+ // Ear
+ EnterpriseArchive settransactiontimeout_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "settransactiontimeout_servlet_vehicle.ear");
+
+ // Any libraries added to the ear
+
+ // The component jars built by the package target
+ settransactiontimeout_servlet_vehicle_ear.addAsModule(settransactiontimeout_servlet_vehicle_web);
+
+
+
+ // // The application.xml descriptor
+ // URL earResURL = UserSetTransactionTimeoutClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/");
+ // if(earResURL != null) {
+ // settransactiontimeout_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml");
+ // }
+ // // The sun-application.xml descriptor
+ // earResURL = UserSetTransactionTimeoutClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/.ear.sun-application.xml");
+ // if(earResURL != null) {
+ // settransactiontimeout_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+ // }
+ // archiveProcessor.processEarArchive(settransactiontimeout_servlet_vehicle_ear, UserSetTransactionTimeoutClient.class, earResURL);
+
+ return settransactiontimeout_servlet_vehicle_ear;
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void testUserSetTransactionTimeout001() throws java.lang.Exception {
+ super.testUserSetTransactionTimeout001();
+ }
+
+ @Test
+ @Override
+ @TargetVehicle("servlet")
+ public void testUserSetTransactionTimeout002() throws java.lang.Exception {
+ super.testUserSetTransactionTimeout002();
+ }
+
+
+}
\ No newline at end of file
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/jsp_vehicle_web.xml b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/jsp_vehicle_web.xml
deleted file mode 100644
index af54232b7e..0000000000
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/jsp_vehicle_web.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
- jsp_vehicle
-
- jsp_vehicle
- /jsp_vehicle.jsp
- 0
-
-
- 54
-
-
- jdbc/DB1
- javax.sql.DataSource
- Container
- Shareable
-
-
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/servlet_vehicle_web.xml b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/servlet_vehicle_web.xml
deleted file mode 100644
index e6178bc18a..0000000000
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/servlet_vehicle_web.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
- servlet_vehicle
-
- Servlet_VehicleLogicalName
- com.sun.ts.tests.common.vehicle.servlet.ServletVehicle
-
-
- Servlet_VehicleLogicalName
- /servlet_vehicle
-
-
- 54
-
-
- jdbc/DB1
- javax.sql.DataSource
- Container
- Shareable
-
-
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ejb_vehicle_ejb.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/ejb_vehicle_ejb.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ejb_vehicle_ejb.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/ejb_vehicle_ejb.xml
diff --git a/jta/src/main/java/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
similarity index 97%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jsp_vehicle_web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jsp_vehicle_web.xml
index 73341d1759..5743a8047b 100644
--- a/jta/src/main/java/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/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate1_ejb.jar.sun-ejb-jar.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate1_ejb.jar.sun-ejb-jar.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate1_ejb.jar.sun-ejb-jar.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate1_ejb.jar.sun-ejb-jar.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate1_ejb.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate1_ejb.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate1_ejb.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate1_ejb.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate2_ejb.jar.sun-ejb-jar.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate2_ejb.jar.sun-ejb-jar.xml
similarity index 96%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate2_ejb.jar.sun-ejb-jar.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate2_ejb.jar.sun-ejb-jar.xml
index 5cd15de582..1f15833687 100644
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate2_ejb.jar.sun-ejb-jar.xml
+++ b/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate2_ejb.jar.sun-ejb-jar.xml
@@ -28,8 +28,8 @@
jdbc/DB1
jdbc/DB1
- user1
- password1
+ cts1
+ cts1
false
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate2_ejb.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate2_ejb.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate2_ejb.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate2_ejb.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate3_ejb.jar.sun-ejb-jar.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate3_ejb.jar.sun-ejb-jar.xml
similarity index 96%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate3_ejb.jar.sun-ejb-jar.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate3_ejb.jar.sun-ejb-jar.xml
index 31580dd16a..27297f4df3 100644
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate3_ejb.jar.sun-ejb-jar.xml
+++ b/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate3_ejb.jar.sun-ejb-jar.xml
@@ -28,8 +28,8 @@
jdbc/DB1
jdbc/DB1
- user1
- password1
+ cts1
+ cts1
false
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate3_ejb.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate3_ejb.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate3_ejb.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate3_ejb.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ejb_vehicle_client.jar.sun-application-client.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ejb_vehicle_client.jar.sun-application-client.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ejb_vehicle_client.jar.sun-application-client.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ejb_vehicle_client.jar.sun-application-client.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ejb_vehicle_ejb.jar.sun-ejb-jar.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_jsp_vehicle_web.war.sun-web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_jsp_vehicle_web.war.sun-web.xml
similarity index 95%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_jsp_vehicle_web.war.sun-web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_jsp_vehicle_web.war.sun-web.xml
index ed8a2d5d04..1dc2b4abe4 100644
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_jsp_vehicle_web.war.sun-web.xml
+++ b/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_jsp_vehicle_web.war.sun-web.xml
@@ -27,8 +27,8 @@
jdbc/DB1
jdbc/DB1
- user1
- password1
+ cts1
+ cts1
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_servlet_vehicle_web.war.sun-web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_servlet_vehicle_web.war.sun-web.xml
similarity index 95%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_servlet_vehicle_web.war.sun-web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_servlet_vehicle_web.war.sun-web.xml
index 3a2c21f800..b81ab67514 100644
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/jta_servlet_vehicle_web.war.sun-web.xml
+++ b/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/jta_servlet_vehicle_web.war.sun-web.xml
@@ -27,8 +27,8 @@
jdbc/DB1
jdbc/DB1
- user1
- password1
+ cts1
+ cts1
diff --git a/jta/src/main/java/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
similarity index 97%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/servlet_vehicle_web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/servlet_vehicle_web.xml
index 626466c5c0..512ea988e7 100644
--- a/jta/src/main/java/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/java/com/sun/ts/tests/jta/ee/usertransaction/begin/appclient_vehicle_client.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/begin/appclient_vehicle_client.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/appclient_vehicle_client.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/begin/appclient_vehicle_client.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/begin_ejb_vehicle_client.jar.sun-application-client.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/begin/begin_ejb_vehicle_client.jar.sun-application-client.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/begin_ejb_vehicle_client.jar.sun-application-client.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/begin/begin_ejb_vehicle_client.jar.sun-application-client.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/begin_ejb_vehicle_ejb.jar.sun-ejb-jar.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/begin/begin_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/begin_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/begin/begin_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/begin_jsp_vehicle_web.war.sun-web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/begin/begin_jsp_vehicle_web.war.sun-web.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/begin_jsp_vehicle_web.war.sun-web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/begin/begin_jsp_vehicle_web.war.sun-web.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/begin_servlet_vehicle_web.war.sun-web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/begin/begin_servlet_vehicle_web.war.sun-web.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/begin_servlet_vehicle_web.war.sun-web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/begin/begin_servlet_vehicle_web.war.sun-web.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/ejb_vehicle_ejb.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/begin/ejb_vehicle_ejb.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/ejb_vehicle_ejb.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/begin/ejb_vehicle_ejb.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/jsp_vehicle_web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/begin/jsp_vehicle_web.xml
similarity index 96%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/jsp_vehicle_web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/begin/jsp_vehicle_web.xml
index af54232b7e..165f9aaa5e 100644
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/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/java/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
similarity index 96%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/servlet_vehicle_web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/begin/servlet_vehicle_web.xml
index e6178bc18a..72589156e0 100644
--- a/jta/src/main/java/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/java/com/sun/ts/tests/jta/ee/usertransaction/commit/appclient_vehicle_client.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/appclient_vehicle_client.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/appclient_vehicle_client.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/appclient_vehicle_client.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/commit_ejb_vehicle_client.jar.sun-application-client.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/commit_ejb_vehicle_client.jar.sun-application-client.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/commit_ejb_vehicle_client.jar.sun-application-client.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/commit_ejb_vehicle_client.jar.sun-application-client.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/commit_ejb_vehicle_ejb.jar.sun-ejb-jar.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/commit_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/commit_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/commit_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/commit_jsp_vehicle_web.war.sun-web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/commit_jsp_vehicle_web.war.sun-web.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/commit_jsp_vehicle_web.war.sun-web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/commit_jsp_vehicle_web.war.sun-web.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/commit_servlet_vehicle_web.war.sun-web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/commit_servlet_vehicle_web.war.sun-web.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/commit_servlet_vehicle_web.war.sun-web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/commit_servlet_vehicle_web.war.sun-web.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/ejb_vehicle_ejb.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/ejb_vehicle_ejb.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/ejb_vehicle_ejb.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/ejb_vehicle_ejb.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/jsp_vehicle_web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/jsp_vehicle_web.xml
similarity index 96%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/jsp_vehicle_web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/jsp_vehicle_web.xml
index af54232b7e..727d696ed4 100644
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/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/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/servlet_vehicle_web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/servlet_vehicle_web.xml
similarity index 96%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/servlet_vehicle_web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/commit/servlet_vehicle_web.xml
index e6178bc18a..59939e89ad 100644
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/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/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/appclient_vehicle_client.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/appclient_vehicle_client.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/appclient_vehicle_client.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/appclient_vehicle_client.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/ejb_vehicle_ejb.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/ejb_vehicle_ejb.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/ejb_vehicle_ejb.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/ejb_vehicle_ejb.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/getstatus_ejb_vehicle_client.jar.sun-application-client.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/getstatus_ejb_vehicle_client.jar.sun-application-client.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/getstatus_ejb_vehicle_client.jar.sun-application-client.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/getstatus_ejb_vehicle_client.jar.sun-application-client.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/getstatus_ejb_vehicle_ejb.jar.sun-ejb-jar.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/getstatus_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/getstatus_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/getstatus_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/getstatus_jsp_vehicle_web.war.sun-web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/getstatus_jsp_vehicle_web.war.sun-web.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/getstatus_jsp_vehicle_web.war.sun-web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/getstatus_jsp_vehicle_web.war.sun-web.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/getstatus_servlet_vehicle_web.war.sun-web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/getstatus_servlet_vehicle_web.war.sun-web.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/getstatus_servlet_vehicle_web.war.sun-web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/getstatus_servlet_vehicle_web.war.sun-web.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/jsp_vehicle_web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/jsp_vehicle_web.xml
similarity index 96%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/jsp_vehicle_web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/jsp_vehicle_web.xml
index af54232b7e..820b75975b 100644
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/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/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/servlet_vehicle_web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/servlet_vehicle_web.xml
similarity index 96%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/servlet_vehicle_web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/getstatus/servlet_vehicle_web.xml
index e6178bc18a..f27ab61ec8 100644
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/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/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/appclient_vehicle_client.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/appclient_vehicle_client.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/appclient_vehicle_client.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/appclient_vehicle_client.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/ejb_vehicle_ejb.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/ejb_vehicle_ejb.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/ejb_vehicle_ejb.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/ejb_vehicle_ejb.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/jsp_vehicle_web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/jsp_vehicle_web.xml
similarity index 96%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/jsp_vehicle_web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/jsp_vehicle_web.xml
index af54232b7e..69de9f6a2c 100644
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/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/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/rollback_ejb_vehicle_client.jar.sun-application-client.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/rollback_ejb_vehicle_client.jar.sun-application-client.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/rollback_ejb_vehicle_client.jar.sun-application-client.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/rollback_ejb_vehicle_client.jar.sun-application-client.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/rollback_ejb_vehicle_ejb.jar.sun-ejb-jar.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/rollback_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/rollback_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/rollback_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/rollback_jsp_vehicle_web.war.sun-web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/rollback_jsp_vehicle_web.war.sun-web.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/rollback_jsp_vehicle_web.war.sun-web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/rollback_jsp_vehicle_web.war.sun-web.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/rollback_servlet_vehicle_web.war.sun-web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/rollback_servlet_vehicle_web.war.sun-web.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/rollback_servlet_vehicle_web.war.sun-web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/rollback_servlet_vehicle_web.war.sun-web.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/servlet_vehicle_web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/servlet_vehicle_web.xml
similarity index 96%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/servlet_vehicle_web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/rollback/servlet_vehicle_web.xml
index e6178bc18a..ecacfd9d24 100644
--- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/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/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/appclient_vehicle_client.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/appclient_vehicle_client.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/appclient_vehicle_client.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/appclient_vehicle_client.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/ejb_vehicle_ejb.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/ejb_vehicle_ejb.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/ejb_vehicle_ejb.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/ejb_vehicle_ejb.xml
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
new file mode 100644
index 0000000000..fb5231e841
--- /dev/null
+++ b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/jsp_vehicle_web.xml
@@ -0,0 +1,36 @@
+
+
+
+
+ setrollbackonly_jsp_vehicle
+
+ jsp_vehicle
+ /jsp_vehicle.jsp
+ 0
+
+
+ 54
+
+
+ jdbc/DB1
+ javax.sql.DataSource
+ Container
+ Shareable
+
+
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
new file mode 100644
index 0000000000..bfa2471f94
--- /dev/null
+++ b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/servlet_vehicle_web.xml
@@ -0,0 +1,39 @@
+
+
+
+
+ setrollbackonly_servlet_vehicle
+
+ Servlet_VehicleLogicalName
+ com.sun.ts.tests.common.vehicle.servlet.ServletVehicle
+
+
+ Servlet_VehicleLogicalName
+ /servlet_vehicle
+
+
+ 54
+
+
+ jdbc/DB1
+ javax.sql.DataSource
+ Container
+ Shareable
+
+
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/setrollbackonly_ejb_vehicle_client.jar.sun-application-client.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/setrollbackonly_ejb_vehicle_client.jar.sun-application-client.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/setrollbackonly_ejb_vehicle_client.jar.sun-application-client.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/setrollbackonly_ejb_vehicle_client.jar.sun-application-client.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/setrollbackonly_ejb_vehicle_ejb.jar.sun-ejb-jar.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/setrollbackonly_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/setrollbackonly_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/setrollbackonly_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/setrollbackonly_jsp_vehicle_web.war.sun-web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/setrollbackonly_jsp_vehicle_web.war.sun-web.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/setrollbackonly_jsp_vehicle_web.war.sun-web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/setrollbackonly_jsp_vehicle_web.war.sun-web.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/setrollbackonly_servlet_vehicle_web.war.sun-web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/setrollbackonly_servlet_vehicle_web.war.sun-web.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/setrollbackonly_servlet_vehicle_web.war.sun-web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/setrollbackonly_servlet_vehicle_web.war.sun-web.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/appclient_vehicle_client.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/appclient_vehicle_client.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/appclient_vehicle_client.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/appclient_vehicle_client.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/ejb_vehicle_ejb.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/ejb_vehicle_ejb.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/ejb_vehicle_ejb.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/ejb_vehicle_ejb.xml
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
new file mode 100644
index 0000000000..d0c57baa30
--- /dev/null
+++ b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/jsp_vehicle_web.xml
@@ -0,0 +1,36 @@
+
+
+
+
+ settransactiontimeout_jsp_vehicle
+
+ jsp_vehicle
+ /jsp_vehicle.jsp
+ 0
+
+
+ 54
+
+
+ jdbc/DB1
+ javax.sql.DataSource
+ Container
+ Shareable
+
+
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
new file mode 100644
index 0000000000..2f36ccd6be
--- /dev/null
+++ b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/servlet_vehicle_web.xml
@@ -0,0 +1,39 @@
+
+
+
+
+ settransactiontimeout_servlet_vehicle
+
+ Servlet_VehicleLogicalName
+ com.sun.ts.tests.common.vehicle.servlet.ServletVehicle
+
+
+ Servlet_VehicleLogicalName
+ /servlet_vehicle
+
+
+ 54
+
+
+ jdbc/DB1
+ javax.sql.DataSource
+ Container
+ Shareable
+
+
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/settransactiontimeout_ejb_vehicle_client.jar.sun-application-client.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/settransactiontimeout_ejb_vehicle_client.jar.sun-application-client.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/settransactiontimeout_ejb_vehicle_client.jar.sun-application-client.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/settransactiontimeout_ejb_vehicle_client.jar.sun-application-client.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/settransactiontimeout_ejb_vehicle_ejb.jar.sun-ejb-jar.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/settransactiontimeout_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/settransactiontimeout_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/settransactiontimeout_ejb_vehicle_ejb.jar.sun-ejb-jar.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/settransactiontimeout_jsp_vehicle_web.war.sun-web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/settransactiontimeout_jsp_vehicle_web.war.sun-web.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/settransactiontimeout_jsp_vehicle_web.war.sun-web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/settransactiontimeout_jsp_vehicle_web.war.sun-web.xml
diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/settransactiontimeout_servlet_vehicle_web.war.sun-web.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/settransactiontimeout_servlet_vehicle_web.war.sun-web.xml
similarity index 100%
rename from jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/settransactiontimeout_servlet_vehicle_web.war.sun-web.xml
rename to jta/src/main/resources/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/settransactiontimeout_servlet_vehicle_web.war.sun-web.xml
diff --git a/jta/src/main/resources/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml b/jta/src/main/resources/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml
new file mode 100644
index 0000000000..5a60880143
--- /dev/null
+++ b/jta/src/main/resources/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+ ejb/EJBVehicle
+ com_sun_ts_tests_common_vehicle_ejb_EJBVehicle
+
+
diff --git a/jta/src/main/resources/vehicle/ejb/ejb_vehicle_client.xml b/jta/src/main/resources/vehicle/ejb/ejb_vehicle_client.xml
new file mode 100644
index 0000000000..e548026fae
--- /dev/null
+++ b/jta/src/main/resources/vehicle/ejb/ejb_vehicle_client.xml
@@ -0,0 +1,28 @@
+
+
+
+
+ TS ejbvehicle client
+ ejb_vehicle_client
+
+ ejb/EJBVehicle
+ Session
+ com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote
+
+
diff --git a/jta/src/main/resources/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml b/jta/src/main/resources/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
new file mode 100644
index 0000000000..21dd1cab5a
--- /dev/null
+++ b/jta/src/main/resources/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+ 0
+
+ com_sun_ts_tests_common_vehicle_ejb_EJBVehicle
+ com_sun_ts_tests_common_vehicle_ejb_EJBVehicle
+ false
+
+
+ supported
+ supported
+ supported
+ supported
+
+
+ username_password
+ default
+ false
+
+
+ supported
+
+
+ false
+ -1
+
+
+
+
diff --git a/jta/src/main/resources/vehicle/ejb/ejb_vehicle_ejb.xml b/jta/src/main/resources/vehicle/ejb/ejb_vehicle_ejb.xml
new file mode 100644
index 0000000000..09ad3eae1e
--- /dev/null
+++ b/jta/src/main/resources/vehicle/ejb/ejb_vehicle_ejb.xml
@@ -0,0 +1,44 @@
+
+
+
+
+ Ejb1
+
+
+ com_sun_ts_tests_common_vehicle_ejb_EJBVehicle
+ com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote
+ com.sun.ts.tests.common.vehicle.ejb.EJBVehicle
+ Stateful
+ Container
+
+
+
+
+
+
+
+
+ com_sun_ts_tests_common_vehicle_ejb_EJBVehicle
+ Remote
+ runTest
+
+ Required
+
+
+
diff --git a/jta/src/main/resources/vehicle/ejblitejsf/beans.xml b/jta/src/main/resources/vehicle/ejblitejsf/beans.xml
new file mode 100644
index 0000000000..3e07dee756
--- /dev/null
+++ b/jta/src/main/resources/vehicle/ejblitejsf/beans.xml
@@ -0,0 +1,22 @@
+
+
+
+
diff --git a/jta/src/main/resources/vehicle/ejblitejsf/ejblitejsf_vehicle.xhtml b/jta/src/main/resources/vehicle/ejblitejsf/ejblitejsf_vehicle.xhtml
new file mode 100644
index 0000000000..3579776664
--- /dev/null
+++ b/jta/src/main/resources/vehicle/ejblitejsf/ejblitejsf_vehicle.xhtml
@@ -0,0 +1,25 @@
+
+
+
+
+ #{param['testName']}_from_ejblitejsf
+
+ #{client.status} #{client.reason}
+
+
diff --git a/jta/src/main/resources/vehicle/ejblitejsf/ejblitejsf_vehicle_web.xml b/jta/src/main/resources/vehicle/ejblitejsf/ejblitejsf_vehicle_web.xml
new file mode 100644
index 0000000000..cb9e27c689
--- /dev/null
+++ b/jta/src/main/resources/vehicle/ejblitejsf/ejblitejsf_vehicle_web.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+ Faces Servlet
+ jakarta.faces.webapp.FacesServlet
+ 1
+
+
+ Faces Servlet
+ /faces/*
+
+
diff --git a/jta/src/main/resources/vehicle/ejblitejsf/faces-config.xml b/jta/src/main/resources/vehicle/ejblitejsf/faces-config.xml
new file mode 100644
index 0000000000..e62777280e
--- /dev/null
+++ b/jta/src/main/resources/vehicle/ejblitejsf/faces-config.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
diff --git a/jta/src/main/resources/vehicle/ejblitejsp/EJBLiteJSPTag.java.txt b/jta/src/main/resources/vehicle/ejblitejsp/EJBLiteJSPTag.java.txt
new file mode 100644
index 0000000000..870098c2e6
--- /dev/null
+++ b/jta/src/main/resources/vehicle/ejblitejsp/EJBLiteJSPTag.java.txt
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+
+package @package@;
+
+import jakarta.servlet.jsp.JspContext;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.JspFragment;
+import jakarta.servlet.jsp.tagext.JspTag;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.SimpleTag;
+import java.io.IOException;
+
+public class EJBLiteJSPTag extends Client implements SimpleTag {
+ /** Reference to the enclosing tag. */
+ private JspTag parentTag;
+
+ /** The JSP context for the upcoming tag invocation. */
+ private JspContext jspContext;
+
+ /** The body of the tag. */
+ private JspFragment jspBody;
+
+ /**
+ * Called by the container to invoke this tag.
+ * The implementation of this method is provided by the tag library developer,
+ * and handles all tag processing, body iteration, etc.
+ */
+ public void doTag() throws JspException {
+ JspWriter out = getJspContext().getOut();
+ setModuleName(
+ ((PageContext) getJspContext()).getServletContext().getContextPath() );
+ String sta = getStatus(); //to trigger the test run
+ getJspContext().setAttribute("statusAndReason", sta + " " + getReason());
+ JspFragment f = getJspBody();
+ if (f != null) {
+ try {
+ f.invoke(out);
+ } catch (IOException e) {
+ throw new JspException(e);
+ }
+ }
+ }
+
+ /**
+ * Sets the parent of this tag, for collaboration purposes.
+ *
+ * The container invokes this method only if this tag invocation is
+ * nested within another tag invocation.
+ *
+ * @param parent the tag that encloses this tag
+ */
+ public void setParent(JspTag parent) {
+ this.parentTag = parent;
+ }
+
+ /**
+ * Returns the parent of this tag, for collaboration purposes.
+ *
+ * @return the parent of this tag
+ */
+ public JspTag getParent() {
+ return this.parentTag;
+ }
+
+ /**
+ * Stores the provided JSP context in the private jspContext field.
+ * Subclasses can access the JspContext via
+ * getJspContext().
+ *
+ * @param pc the page context for this invocation
+ * @see SimpleTag#setJspContext
+ */
+ public void setJspContext(JspContext pc) {
+ this.jspContext = pc;
+ }
+
+ /**
+ * Returns the page context passed in by the container via
+ * setJspContext.
+ *
+ * @return the page context for this invocation
+ */
+ protected JspContext getJspContext() {
+ return this.jspContext;
+ }
+
+ /**
+ * Stores the provided JspFragment.
+ *
+ * @param jspBody The fragment encapsulating the body of this tag.
+ * If the action element is empty in the page, this method is
+ * not called at all.
+ * @see SimpleTag#setJspBody
+ */
+ public void setJspBody(JspFragment jspBody) {
+ this.jspBody = jspBody;
+ }
+
+ /**
+ * Returns the body passed in by the container via setJspBody.
+ *
+ * @return the fragment encapsulating the body of this tag, or
+ * null if the action element is empty in the page.
+ */
+ protected JspFragment getJspBody() {
+ return this.jspBody;
+ }
+
+}
diff --git a/jta/src/main/resources/vehicle/ejblitejsp/beans.xml b/jta/src/main/resources/vehicle/ejblitejsp/beans.xml
new file mode 100644
index 0000000000..3e07dee756
--- /dev/null
+++ b/jta/src/main/resources/vehicle/ejblitejsp/beans.xml
@@ -0,0 +1,22 @@
+
+
+
+
diff --git a/jta/src/main/resources/vehicle/ejblitejsp/ejblitejsp.tld b/jta/src/main/resources/vehicle/ejblitejsp/ejblitejsp.tld
new file mode 100644
index 0000000000..b34e4806f7
--- /dev/null
+++ b/jta/src/main/resources/vehicle/ejblitejsp/ejblitejsp.tld
@@ -0,0 +1,45 @@
+
+
+
+
+ 1.0
+ ejblitejsp
+ /WEB-INF/tlds/ejblitejsp
+
+ EJBLiteJSPTag
+ com.sun.ts.tests.jta.ee.transactional.EJBLiteJSPTag
+ scriptless
+
+ to display return value of getReason()
+ statusAndReason
+
+
+ testName
+ true
+ true
+ java.lang.String
+
+
+ injectionSupported
+ true
+ true
+ java.lang.Boolean
+
+
+
diff --git a/jta/src/main/resources/vehicle/ejblitejsp/ejblitejsp_vehicle.jsp b/jta/src/main/resources/vehicle/ejblitejsp/ejblitejsp_vehicle.jsp
new file mode 100644
index 0000000000..b99df69627
--- /dev/null
+++ b/jta/src/main/resources/vehicle/ejblitejsp/ejblitejsp_vehicle.jsp
@@ -0,0 +1,30 @@
+<%--
+
+ Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@page contentType="text/html"%>
+<%@taglib prefix="ejblitejsp" uri="/WEB-INF/tlds/ejblitejsp.tld"%>
+<%@taglib prefix="c" uri="jakarta.tags.core"%>
+
+
+
${param['testName']}_from_ejblitejsp
+
+
+
+
+
+
diff --git a/jta/src/main/resources/vehicle/ejbliteservlet/EJBLiteServletVehicle.java.txt b/jta/src/main/resources/vehicle/ejbliteservlet/EJBLiteServletVehicle.java.txt
new file mode 100644
index 0000000000..72e78bc162
--- /dev/null
+++ b/jta/src/main/resources/vehicle/ejbliteservlet/EJBLiteServletVehicle.java.txt
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+
+package @package@;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Enumeration;
+import java.util.Iterator;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import java.util.logging.Logger;
+import java.util.logging.Level;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+public class EJBLiteServletVehicle extends Client
+ implements Servlet, ServletConfig {
+
+ private static Logger logger = Logger.getLogger(EJBLiteServletVehicle.class.getName());
+
+ private HttpServletDelegate delegate = new HttpServletDelegate();
+
+ public void init(ServletConfig config) throws ServletException {
+ delegate.init(config);
+ }
+
+ public ServletConfig getServletConfig() {
+ return delegate.getServletConfig();
+ }
+
+ public void service(ServletRequest request, ServletResponse response) throws ServletException, IOException {
+ delegate.service(request, response);
+
+ setInjectionSupported(true);
+ String tn = request.getParameter("testName");
+ logger.fine("EJBLiteServletVehicle processing request testName=" + tn);
+ setTestName(tn);
+ setModuleName(getServletContext().getContextPath());
+ String sta = getStatus(); //to trigger the test run
+
+ PrintWriter pw = response.getWriter();
+ pw.println(sta + " " + getReason());
+ cleanup(); //need to reset all fields since servlet instances are shared
+
+ }
+
+ public String getServletInfo() {
+ return delegate.getServletInfo();
+ }
+
+ public void destroy() {
+ delegate.destroy();
+ delegate = null;
+ }
+
+ public String getServletName() {
+ return delegate.getServletName();
+ }
+
+ public ServletContext getServletContext() {
+ return delegate.getServletContext();
+ }
+
+ public String getInitParameter(String arg0) {
+ return delegate.getInitParameter(arg0);
+ }
+
+ public Enumeration getInitParameterNames() {
+ return delegate.getInitParameterNames();
+ }
+
+
+}
diff --git a/jta/src/main/resources/vehicle/ejbliteservlet/HttpServletDelegate.java.txt b/jta/src/main/resources/vehicle/ejbliteservlet/HttpServletDelegate.java.txt
new file mode 100644
index 0000000000..1ffa9276d4
--- /dev/null
+++ b/jta/src/main/resources/vehicle/ejbliteservlet/HttpServletDelegate.java.txt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+ package @package@;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.ServletException;
+import java.util.logging.Logger;
+import java.util.logging.Level;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+public class HttpServletDelegate extends HttpServlet {
+
+ private static Logger logger = Logger.getLogger(HttpServletDelegate.class.getName());
+
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ processRequest(request, response);
+ }
+
+ @Override
+ protected void doPost(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ processRequest(request, response);
+ }
+
+ private void processRequest(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ response.setContentType("text/plain");
+ }
+ }
diff --git a/jta/src/main/resources/vehicle/ejbliteservlet/beans.xml b/jta/src/main/resources/vehicle/ejbliteservlet/beans.xml
new file mode 100644
index 0000000000..3e07dee756
--- /dev/null
+++ b/jta/src/main/resources/vehicle/ejbliteservlet/beans.xml
@@ -0,0 +1,22 @@
+
+
+
+
diff --git a/jta/src/main/resources/vehicle/ejbliteservlet/ejbliteservlet_vehicle_web.xml b/jta/src/main/resources/vehicle/ejbliteservlet/ejbliteservlet_vehicle_web.xml
new file mode 100644
index 0000000000..06e9e7adcf
--- /dev/null
+++ b/jta/src/main/resources/vehicle/ejbliteservlet/ejbliteservlet_vehicle_web.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+ EJBLiteServletVehicle
+ com.sun.ts.tests.jta.ee.transactional.EJBLiteServletVehicle
+
+
+ EJBLiteServletVehicle
+ /ejbliteservlet_vehicle.jsp
+
+
diff --git a/jta/src/main/resources/vehicle/ejbliteservlet2/EJBLiteServlet2Filter.java.txt b/jta/src/main/resources/vehicle/ejbliteservlet2/EJBLiteServlet2Filter.java.txt
new file mode 100644
index 0000000000..2e4213ff97
--- /dev/null
+++ b/jta/src/main/resources/vehicle/ejbliteservlet2/EJBLiteServlet2Filter.java.txt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+
+package @package@;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletResponse;
+import java.util.logging.Logger;
+import java.util.logging.Level;
+
+public class EJBLiteServlet2Filter extends Client implements Filter {
+ private static Logger logger = Logger.getLogger(EJBLiteServlet2Filter.class.getName());
+ private FilterConfig filterConfig;
+
+ public void doFilter(ServletRequest request, ServletResponse response,
+ FilterChain chain)
+ throws IOException, ServletException {
+ response.setContentType("text/plain");
+ setInjectionSupported(true);
+ String tn = request.getParameter("testName");
+ if(logger.isLoggable(Level.FINE)) {
+ logger.fine("doFilter testName=" + tn);
+ }
+ setTestName(tn);
+ setModuleName( ((HttpServletRequest) request).getContextPath() );
+ String sta = getStatus(); //to trigger the test run
+ PrintWriter pw = response.getWriter();
+ pw.println(sta + " " + getReason());
+ cleanup(); //need to reset all fields since filter instances are shared
+ //skip the rest of the chain
+ }
+
+ public void destroy() {
+ }
+
+ public void init(FilterConfig filterConfig) {
+ this.filterConfig = filterConfig;
+ }
+}
diff --git a/jta/src/main/resources/vehicle/ejbliteservlet2/beans.xml b/jta/src/main/resources/vehicle/ejbliteservlet2/beans.xml
new file mode 100644
index 0000000000..3e07dee756
--- /dev/null
+++ b/jta/src/main/resources/vehicle/ejbliteservlet2/beans.xml
@@ -0,0 +1,22 @@
+
+
+
+
diff --git a/jta/src/main/resources/vehicle/ejbliteservlet2/ejbliteservlet2_vehicle.jsp b/jta/src/main/resources/vehicle/ejbliteservlet2/ejbliteservlet2_vehicle.jsp
new file mode 100644
index 0000000000..585090e38d
--- /dev/null
+++ b/jta/src/main/resources/vehicle/ejbliteservlet2/ejbliteservlet2_vehicle.jsp
@@ -0,0 +1,24 @@
+<%--
+
+ Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@page contentType="text/html"%>
+
+
+ ${param['testName']}_from_ejbliteservlet2
+ Intercepted by filter
+
diff --git a/jta/src/main/resources/vehicle/ejbliteservlet2/ejbliteservlet2_vehicle_web.xml b/jta/src/main/resources/vehicle/ejbliteservlet2/ejbliteservlet2_vehicle_web.xml
new file mode 100644
index 0000000000..cc28daebeb
--- /dev/null
+++ b/jta/src/main/resources/vehicle/ejbliteservlet2/ejbliteservlet2_vehicle_web.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+ EJBLiteServlet2Filter
+ com.sun.ts.tests.jta.ee.transactional.EJBLiteServlet2Filter
+
+
+ EJBLiteServlet2Filter
+ ejbliteservlet2_vehicle.jsp
+
+
+ ejbliteservlet2_vehicle.jsp
+ /ejbliteservlet2_vehicle.jsp
+
+
+ ejbliteservlet2_vehicle.jsp
+ /ejbliteservlet2_vehicle.jsp
+
+
diff --git a/jta/src/main/resources/vehicle/jsp/contentRoot/client.html b/jta/src/main/resources/vehicle/jsp/contentRoot/client.html
new file mode 100644
index 0000000000..fe2a10403c
--- /dev/null
+++ b/jta/src/main/resources/vehicle/jsp/contentRoot/client.html
@@ -0,0 +1,30 @@
+
+
+
+
+
+ Invoke the generic Jsp for testing purposes
+
+
+ Invoke the generic Jsp for testing purposes
+
+
+ Invoke the jsp here!
+
+
diff --git a/jta/src/main/resources/vehicle/jsp/contentRoot/jsp_vehicle.jsp b/jta/src/main/resources/vehicle/jsp/contentRoot/jsp_vehicle.jsp
new file mode 100644
index 0000000000..12ad682705
--- /dev/null
+++ b/jta/src/main/resources/vehicle/jsp/contentRoot/jsp_vehicle.jsp
@@ -0,0 +1,117 @@
+<%--
+
+ Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page language="java" %>
+<%@ page import="javax.naming.*" %>
+<%@ page import="java.rmi.RemoteException" %>
+<%@ page import="java.util.*" %>
+<%@ page import="java.io.*" %>
+<%@ page import="com.sun.ts.lib.util.*" %>
+<%@ page import="com.sun.ts.lib.harness.*" %>
+<%@ page import="com.sun.ts.lib.harness.Status" %>
+<%@ page session="false" %>
+
+<%! Properties properties = null;
+ String[] arguments = null;
+ EETest testObj = null;
+ Properties stp=new Properties();
+ StringBuffer propsData = new StringBuffer();
+
+%>
+
+<%! private RemoteStatus runTest() throws RemoteException {
+ RemoteStatus sTestStatus = new RemoteStatus(Status.passed(""));
+ try
+ {
+ //call EETest impl's run method
+ sTestStatus = new RemoteStatus(testObj.run(arguments, properties));
+ if(sTestStatus.getType() == Status.PASSED)
+ TestUtil.logMsg("Test running in jsp vehicle passed");
+ else
+ TestUtil.logMsg("Test running in jsp vehicle failed");
+ }
+ catch(Throwable e)
+ {
+ TestUtil.logErr("Test running in jsp vehicle failed", e);
+ sTestStatus =
+ new RemoteStatus(Status.failed("Test running in jsp vehicle failed"));
+ }
+ return sTestStatus;
+ }
+
+%>
+
+<%
+ try {
+ //get the inputstream and read any objects passed from the
+ //client, e.g. properties, args, etc.
+ //wrap the Inputstream in an ObjectInputstream and read
+ //the properties and args.
+ TestUtil.logTrace("JSPVehicle - In doJSPGet");
+ ObjectInputStream objInStream =
+ new ObjectInputStream(new BufferedInputStream(request.getInputStream()));
+ TestUtil.logTrace("JSPVehicle - got InputStream");
+ properties = (Properties)objInStream.readObject();
+ TestUtil.logTrace("JSP Vehicle -read properties!!!");
+ TestUtil.logTrace("JSP Vehicle - list the props ");
+ TestUtil.list(properties);
+
+ //create an instance of the test client and run here
+ Class c =
+ Class.forName(properties.getProperty("test_classname"));
+ testObj = (EETest) c.newInstance();
+
+ arguments = (String[])objInStream.readObject();
+ //arguments = new String[1];
+ //arguments[0] = "";
+ TestUtil.logTrace("JSPVehicle - read Objects");
+ try
+ {
+ TestUtil.init(properties);
+ TestUtil.logTrace("Remote logging set for JSP Vehicle");
+ TestUtil.logTrace("JSPVehicle - Here are the props");
+ //TestUtil.list(properties);
+ }
+ catch (Exception e)
+ {
+ throw new ServletException("unable to initialize remote logging");
+ }
+ //now run the test and return the result
+ RemoteStatus finalStatus = runTest();
+ // Create properties object
+ stp.setProperty("type", String.valueOf(finalStatus.toStatus().getType()));
+ stp.setProperty("reason", finalStatus.toStatus().getReason());
+ java.util.Enumeration key = stp.keys();
+ String name;
+ while (key.hasMoreElements())
+ {
+ name = (String)key.nextElement();
+ propsData.append(name+"="+stp.getProperty(name)+"\n");
+ }
+
+ }
+ catch(Exception e2)
+ {
+ System.out.println(e2.getMessage());
+ TestUtil.logTrace(e2.getMessage());
+ e2.printStackTrace();
+ throw new ServletException("test failed to run within the Servlet Vehicle");
+ }
+%>
+
+<%= propsData.toString() %>