JBTM-1963. Automatically added TXBridge handler should be optional

testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/annotation/client/TransactionalClient.java

@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.as.test.xts.annotation.client;
+
+import org.jboss.as.test.xts.annotation.service.TransactionalService;
+import org.jboss.logging.Logger;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+/**
+ * @author <a href="mailto:gytis@redhat.com">Gytis Trikleris</a>
+ */
+public class TransactionalClient {
+
+    private static Logger LOG = Logger.getLogger(TransactionalClient.class);
+
+    private static final String NAME = "TransactionalServiceImpl";
+
+    private static final String TARGET_NAMESPACE = "http://service.annotation.xts.test.as.jboss.org/";
+
+    private static final String PORT_NAME = "TransactionalServiceImplPort";
+
+    private static final String SERVICE_NAME = "TransactionalServiceImplService";
+
+    public static TransactionalService newInstance(final String deploymentUrl) throws MalformedURLException {
+        LOG.debug("TransactionalClient.newInstance(deploymentUrl = " + deploymentUrl + ")");
+
+        final URL wsdlLocation = new URL(deploymentUrl + "/" + NAME + "?wsdl");
+
+        LOG.debug("wsdlLocation for service: " + wsdlLocation);
+
+        final QName serviceName = new QName(TARGET_NAMESPACE, SERVICE_NAME);
+        final QName portName = new QName(TARGET_NAMESPACE, PORT_NAME);
+
+        final Service service = Service.create(wsdlLocation, serviceName);
+        final TransactionalService transactionalService = service.getPort(portName, TransactionalService.class);
+
+        return transactionalService;
+    }
+
+}

testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/annotation/client/TransactionalTestCase.java

@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.as.test.xts.annotation.client;
+
+import com.arjuna.mw.wst11.UserTransaction;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.as.arquillian.container.ManagementClient;
+import org.jboss.as.test.xts.annotation.service.TransactionalService;
+import org.jboss.as.test.xts.annotation.service.TransactionalServiceImpl;
+import org.jboss.shrinkwrap.api.ArchivePaths;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * @author <a href="mailto:gytis@redhat.com">Gytis Trikleris</a>
+ */
+@RunWith(Arquillian.class)
+public class TransactionalTestCase {
+
+    private static final String DEPLOYMENT_NAME = "transactional-test";
+
+    @ArquillianResource
+    private ManagementClient managementClient;
+
+    @Deployment
+    public static WebArchive getDeployment() {
+        final WebArchive webArchive = ShrinkWrap.create(WebArchive.class, DEPLOYMENT_NAME + ".war")
+                .addClass(TransactionalClient.class)
+                .addClass(TransactionalService.class)
+                .addClass(TransactionalServiceImpl.class)
+                .addAsManifestResource(new StringAsset("Dependencies: org.jboss.xts,org.jboss.jts\n"), "MANIFEST.MF")
+                .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"));
+
+        return webArchive;
+    }
+
+    @Test
+    public void testNoTransaction() throws Exception {
+        final String deploymentUrl = getDeploymentUrl();
+        final TransactionalService transactionalService = TransactionalClient.newInstance(deploymentUrl);
+
+        final boolean isTransactionActive = transactionalService.isTransactionActive();
+
+        Assert.assertEquals(false, isTransactionActive);
+    }
+
+    @Test
+    public void testActiveTransaction() throws Exception {
+        final String deploymentUrl = getDeploymentUrl();
+        final TransactionalService transactionalService = TransactionalClient.newInstance(deploymentUrl);
+        final UserTransaction userTransaction = UserTransaction.getUserTransaction();
+
+        userTransaction.begin();
+        final boolean isTransactionActive = transactionalService.isTransactionActive();
+        userTransaction.commit();
+
+        Assert.assertEquals(true, isTransactionActive);
+    }
+
+    private String getDeploymentUrl() {
+        final String baseUrl = managementClient.getWebUri().toString();
+
+        return baseUrl + "/" + DEPLOYMENT_NAME;
+    }
+
+}

testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/annotation/service/TransactionalService.java

@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.as.test.xts.annotation.service;
+
+import javax.jws.WebMethod;
+
+/**
+ * @author <a href="mailto:gytis@redhat.com">Gytis Trikleris</a>
+ */
+public interface TransactionalService {
+
+    @WebMethod
+    boolean isTransactionActive();
+
+}

testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/annotation/service/TransactionalServiceImpl.java

@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.as.test.xts.annotation.service;
+
+import com.arjuna.ats.jta.TransactionManager;
+import org.jboss.logging.Logger;
+
+import javax.ejb.Stateless;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.transaction.Status;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+
+/**
+ * @author <a href="mailto:gytis@redhat.com">Gytis Trikleris</a>
+ */
+@Stateless
+@WebService(portName = "TransactionalServiceImplPort", targetNamespace = "http://service.annotation.xts.test.as.jboss.org/")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+@TransactionAttribute(TransactionAttributeType.SUPPORTS)
+public class TransactionalServiceImpl implements TransactionalService {
+
+    private static Logger LOG = Logger.getLogger(TransactionalServiceImpl.class);
+
+    @Override
+    public boolean isTransactionActive() {
+        LOG.debug("TransactionalServiceImpl.isTransactionActive()");
+
+        Transaction transaction = null;
+
+        try {
+            transaction = TransactionManager.transactionManager().getTransaction();
+        } catch (SystemException e) {
+        }
+
+        if (transaction == null) {
+            return false;
+        }
+
+        try {
+            return transaction.getStatus() == Status.STATUS_ACTIVE;
+        } catch (SystemException e) {
+            return false;
+        }
+    }
+
+}

xts/src/main/java/org/jboss/as/xts/XTSHandlerDeploymentProcessor.java

@@ -56,7 +56,7 @@
  */
 public class XTSHandlerDeploymentProcessor implements DeploymentUnitProcessor {
 
-    private static final String TX_BRIDGE_HANDLER = "org.jboss.jbossts.txbridge.inbound.JaxWSTxInboundBridgeHandler";
+    private static final String TX_BRIDGE_HANDLER = "org.jboss.jbossts.txbridge.inbound.OptionalJaxWSTxInboundBridgeHandler";
 
     private static final String TX_CONTEXT_HANDLER = "com.arjuna.mw.wst11.service.JaxWSHeaderContextProcessor";