[jboss-svn-commits] JBL Code SVN: r33740 - in labs/jbosstm/trunk/XTS: WS-C/dev/dd and 43 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jul 5 09:25:14 EDT 2010
Author: adinn
Date: 2010-07-05 09:25:11 -0400 (Mon, 05 Jul 2010)
New Revision: 33740
Added:
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/SoapFault11.java
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/soapfault/
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/soapfault/build.sh
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/soapfault/wsdl/
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/soapfault/wsdl/envelope.xsd
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/soapfault/wsdl/soapfault.wsdl
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/soapfault/
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/soapfault/client/
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/soapfault/client/SoapFaultClient.java
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/org/
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/org/jboss/
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/org/jboss/jbossts/
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/org/jboss/jbossts/xts/
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/org/jboss/jbossts/xts/soapfault/
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/org/jboss/jbossts/xts/soapfault/SoapFaultPortType.java
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/org/jboss/jbossts/xts/soapfault/SoapFaultService.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/soapfault/
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/soapfault/build.sh
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/soapfault/wsdl/
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/soapfault/wsdl/envelope.xsd
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/soapfault/wsdl/soapfault.wsdl
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/soapfault/
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/soapfault/client/
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/soapfault/client/SoapFaultClient.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/org/
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/org/jboss/
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/org/jboss/jbossts/
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/org/jboss/jbossts/xts/
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/org/jboss/jbossts/xts/soapfault/
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/org/jboss/jbossts/xts/soapfault/SoapFaultPortType.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/org/jboss/jbossts/xts/soapfault/SoapFaultService.java
Removed:
labs/jbosstm/trunk/XTS/WS-C/dev/dd/soapfault/
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/SoapFault11.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/client/
labs/jbosstm/trunk/XTS/WS-C/dev/src11/org/jboss/
Modified:
labs/jbosstm/trunk/XTS/WS-C/build.xml
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorPortTypeImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionInitiatorClient.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CoordinatorClient.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/ParticipantClient.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionInitiatorPortTypeImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CoordinatorPortTypeImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/ParticipantPortTypeImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionCoordinatorClient.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionParticipantClient.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionCoordinatorClient.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionParticipantClient.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CompletionInitiatorPortType.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CoordinatorPortType.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/ParticipantPortType.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionCoordinatorPortType.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionParticipantPortType.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionCoordinatorPortType.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionParticipantPortType.java
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/sc007/build.sh
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InitiatorClient.java
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java
Log:
made final (I hope) changes to get XTS unit and interop tests to run on both latest AS trunk/WS-CXF and 6.0.0.M3/WS-Native. included removing use of soapfault service from deployed XTS service archive (but not form interop test code) -- fixes for JBTM-755
Modified: labs/jbosstm/trunk/XTS/WS-C/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/build.xml 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-C/build.xml 2010-07-05 13:25:11 UTC (rev 33740)
@@ -162,8 +162,6 @@
<copy file="${dd.dir}/wscoor1.1/wsdl/ws-addr.xsd" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/wsdl/ws-addr.xsd"/>
<copy file="${dd.dir}/wscoor1.1/wsdl/wscoor-activation-binding.wsdl" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/wsdl/wscoor-activation-binding.wsdl"/>
<copy file="${dd.dir}/wscoor1.1/wsdl/wscoor-registration-binding.wsdl" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/wsdl/wscoor-registration-binding.wsdl"/>
- <copy file="${dd.dir}/soapfault/wsdl/soapfault.wsdl" tofile="${build.classes11.dir}/org/jboss/jbossts/xts/soapfault/wsdl/soapfault.wsdl"/>
- <copy file="${dd.dir}/soapfault/wsdl/envelope.xsd" tofile="${build.classes11.dir}/org/jboss/jbossts/xts/soapfault/wsdl/envelope.xsd"/>
</target>
<target name="jars-generic">
Deleted: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/SoapFault11.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/SoapFault11.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/SoapFault11.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -1,200 +0,0 @@
-package com.arjuna.webservices11;
-
-import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices.SoapFaultType;
-import org.w3c.dom.Element;
-import org.jboss.jbossts.xts.soapfault.Fault;
-
-import javax.xml.namespace.QName;
-
-/**
- * Created by IntelliJ IDEA.
- * User: adinn
- * Date: Feb 1, 2008
- * Time: 4:57:16 PM
- * To change this template use File | Settings | File Templates.
- */
-public class SoapFault11 extends SoapFault {
- /**
- * The detailElement element.
- */
- private Element detailElement;
- /**
- * The header elements.
- */
- private Element[] headerElements ;
- /**
- * Default constructor.
- */
- public SoapFault11()
- {
- super();
- }
-
- /**
- * Construct a SOAP fault based on a throwable.
- * @param th The throwable.
- */
- public SoapFault11(final Throwable th)
- {
- super(th);
- }
-
- /**
- * Construct a SOAP header fault based on a throwable.
- * @param th The throwable.
- * @param headerElements The header elements.
- */
- public SoapFault11(final Throwable th, final Element[] headerElements)
- {
- super(th);
- this.headerElements = headerElements;
- }
-
- /**
- * Create a custom SOAP fault.
- * @param soapFaultType the soap fault type.
- * @param subcode The fault subcode.
- * @param reason The fault reason.
- */
- public SoapFault11(final SoapFaultType soapFaultType, final QName subcode, final String reason)
- {
- super(soapFaultType, subcode, reason) ;
- }
-
- /**
- * Create a custom SOAP fault.
- * @param soapFaultType the soap fault type.
- * @param subcode The fault subcode.
- * @param reason The fault reason.
- * @param headerElements The header elements.
- */
- public SoapFault11(final SoapFaultType soapFaultType, final QName subcode, final String reason, final Element[] headerElements)
- {
- super(soapFaultType, subcode, reason, null);
- this.headerElements = headerElements ;
- }
-
- /**
- * Create a custom SOAP fault.
- * @param soapFaultType the soap fault type.
- * @param subcode The fault subcode.
- * @param reason The fault reason.
- * @param detailElement The fault detailElement.
- */
- public SoapFault11(final SoapFaultType soapFaultType, final QName subcode, final String reason, final Element detailElement)
- {
- super(soapFaultType, subcode, reason, getDetailString(detailElement)) ;
- this.detailElement = detailElement;
- }
-
- /**
- * Create a custom SOAP fault.
- * @param soapFaultType the soap fault type.
- * @param reason The fault reason.
- */
- public SoapFault11(final SoapFaultType soapFaultType, final String reason)
- {
- this(soapFaultType, null, reason, null, null) ;
- }
-
- /**
- * Create a custom SOAP fault.
- * @param soapFaultType the soap fault type.
- * @param reason The fault reason.
- * @param detailElement The fault detailElement.
- */
- public SoapFault11(final SoapFaultType soapFaultType,
- final String reason, final Element detailElement)
- {
- this(soapFaultType, null, reason, detailElement, null) ;
- }
-
- /**
- * Create a custom SOAP fault.
- * @param soapFaultType the soap fault type.
- * @param subcode The fault subcode.
- * @param reason The fault reason.
- * @param detailElement The fault detailElement.
- * @param headerElements The fault header elements.
- */
- public SoapFault11(final SoapFaultType soapFaultType, final QName subcode,
- final String reason, final Element detailElement, final Element[] headerElements)
- {
- this.soapFaultType = soapFaultType ;
- this.subcode = subcode ;
- this.reason = reason ;
- this.detailElement = detailElement;
- this.headerElements = headerElements ;
- }
-
- // convert to/from fault we can send via the SoapFaultService
-
- public Fault toFault()
- {
- Fault fault = new Fault();
- QName faultcode = subcode;
- String faultstring = getReason();
- fault.setFaultcode(faultcode);
- fault.setFaultstring(faultstring);
- return fault;
- }
-
- public static SoapFault11 fromFault(Fault fault)
- {
- try {
- QName subcode = fault.getFaultcode();
- String reason = fault.getFaultstring();
- return new SoapFault11(SoapFaultType.FAULT_SENDER, subcode, reason);
- } catch (Throwable th) {
- return new SoapFault11(th);
- }
- }
-
- /**
- * Get the SOAP fault detailElement.
- * @return The SOAP fault detailElement.
- */
- public Element getDetailElement()
- {
- return detailElement;
- }
-
- /**
- * Set the SOAP fault detailElement.
- * @param detailElement The SOAP fault detailElement.
- */
- public void setDetailElement(final Element detailElement)
- {
- this.detailElement = detailElement;
- }
-
- /**
- * Get the SOAP fault header elements.
- * @return The SOAP fault header elements.
- */
- public Element[] getHeaderElements()
- {
- return headerElements ;
- }
-
- /**
- * Set the SOAP fault header elements.
- * @param headerElements The SOAP fault header elements.
- */
- public void setHeaderElements(final Element[] headerElements)
- {
- this.headerElements = headerElements ;
- }
-
- /**
- * return a String representing the supplied detail element
- * @param detailElement
- * @return
- */
-
- private static String getDetailString(Element detailElement)
- {
- return detailElement.getTextContent();
- }
-}
Added: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/SoapFault11.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/SoapFault11.java (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/SoapFault11.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -0,0 +1,206 @@
+package com.arjuna.webservices11;
+
+import com.arjuna.webservices.SoapFault;
+import com.arjuna.webservices.SoapFaultType;
+import org.w3c.dom.Element;
+import org.xmlsoap.schemas.soap.envelope.Fault;
+import org.xmlsoap.schemas.soap.envelope.ObjectFactory;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: adinn
+ * Date: Feb 1, 2008
+ * Time: 4:57:16 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class SoapFault11 extends SoapFault {
+ /**
+ * The detailElement element.
+ */
+ private Element detailElement;
+ /**
+ * The header elements.
+ */
+ private Element[] headerElements ;
+ /**
+ * Default constructor.
+ */
+ public SoapFault11()
+ {
+ super();
+ }
+
+ /**
+ * Construct a SOAP fault based on a throwable.
+ * @param th The throwable.
+ */
+ public SoapFault11(final Throwable th)
+ {
+ super(th);
+ }
+
+ /**
+ * Construct a SOAP header fault based on a throwable.
+ * @param th The throwable.
+ * @param headerElements The header elements.
+ */
+ public SoapFault11(final Throwable th, final Element[] headerElements)
+ {
+ super(th);
+ this.headerElements = headerElements;
+ }
+
+ /**
+ * Create a custom SOAP fault.
+ * @param soapFaultType the soap fault type.
+ * @param subcode The fault subcode.
+ * @param reason The fault reason.
+ */
+ public SoapFault11(final SoapFaultType soapFaultType, final QName subcode, final String reason)
+ {
+ super(soapFaultType, subcode, reason) ;
+ }
+
+ /**
+ * Create a custom SOAP fault.
+ * @param soapFaultType the soap fault type.
+ * @param subcode The fault subcode.
+ * @param reason The fault reason.
+ * @param headerElements The header elements.
+ */
+ public SoapFault11(final SoapFaultType soapFaultType, final QName subcode, final String reason, final Element[] headerElements)
+ {
+ super(soapFaultType, subcode, reason, null);
+ this.headerElements = headerElements ;
+ }
+
+ /**
+ * Create a custom SOAP fault.
+ * @param soapFaultType the soap fault type.
+ * @param subcode The fault subcode.
+ * @param reason The fault reason.
+ * @param detailElement The fault detailElement.
+ */
+ public SoapFault11(final SoapFaultType soapFaultType, final QName subcode, final String reason, final Element detailElement)
+ {
+ super(soapFaultType, subcode, reason, getDetailString(detailElement)) ;
+ this.detailElement = detailElement;
+ }
+
+ /**
+ * Create a custom SOAP fault.
+ * @param soapFaultType the soap fault type.
+ * @param reason The fault reason.
+ */
+ public SoapFault11(final SoapFaultType soapFaultType, final String reason)
+ {
+ this(soapFaultType, null, reason, null, null) ;
+ }
+
+ /**
+ * Create a custom SOAP fault.
+ * @param soapFaultType the soap fault type.
+ * @param reason The fault reason.
+ * @param detailElement The fault detailElement.
+ */
+ public SoapFault11(final SoapFaultType soapFaultType,
+ final String reason, final Element detailElement)
+ {
+ this(soapFaultType, null, reason, detailElement, null) ;
+ }
+
+ /**
+ * Create a custom SOAP fault.
+ * @param soapFaultType the soap fault type.
+ * @param subcode The fault subcode.
+ * @param reason The fault reason.
+ * @param detailElement The fault detailElement.
+ * @param headerElements The fault header elements.
+ */
+ public SoapFault11(final SoapFaultType soapFaultType, final QName subcode,
+ final String reason, final Element detailElement, final Element[] headerElements)
+ {
+ this.soapFaultType = soapFaultType ;
+ this.subcode = subcode ;
+ this.reason = reason ;
+ this.detailElement = detailElement;
+ this.headerElements = headerElements ;
+ }
+
+ /**
+ * factory to use for creating faults
+ */
+ private static ObjectFactory factory = new ObjectFactory();
+
+ // convert to/from fault we can send via the SoapFaultService
+
+ public Fault toFault()
+ {
+ Fault fault = factory.createFault();
+ QName faultcode = subcode;
+ String faultstring = getReason();
+ fault.setFaultcode(faultcode);
+ fault.setFaultstring(faultstring);
+ return fault;
+ }
+
+ public static SoapFault11 fromFault(Fault fault)
+ {
+ try {
+ QName subcode = fault.getFaultcode();
+ String reason = fault.getFaultstring();
+ return new SoapFault11(SoapFaultType.FAULT_SENDER, subcode, reason);
+ } catch (Throwable th) {
+ return new SoapFault11(th);
+ }
+ }
+
+ /**
+ * Get the SOAP fault detailElement.
+ * @return The SOAP fault detailElement.
+ */
+ public Element getDetailElement()
+ {
+ return detailElement;
+ }
+
+ /**
+ * Set the SOAP fault detailElement.
+ * @param detailElement The SOAP fault detailElement.
+ */
+ public void setDetailElement(final Element detailElement)
+ {
+ this.detailElement = detailElement;
+ }
+
+ /**
+ * Get the SOAP fault header elements.
+ * @return The SOAP fault header elements.
+ */
+ public Element[] getHeaderElements()
+ {
+ return headerElements ;
+ }
+
+ /**
+ * Set the SOAP fault header elements.
+ * @param headerElements The SOAP fault header elements.
+ */
+ public void setHeaderElements(final Element[] headerElements)
+ {
+ this.headerElements = headerElements ;
+ }
+
+ /**
+ * return a String representing the supplied detail element
+ * @param detailElement
+ * @return
+ */
+
+ private static String getDetailString(Element detailElement)
+ {
+ return detailElement.getTextContent();
+ }
+}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorPortTypeImpl.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorPortTypeImpl.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -11,6 +11,7 @@
import org.jboss.wsf.common.addressing.MAP;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices.SoapFault;
+import org.xmlsoap.schemas.soap.envelope.Fault;
import javax.annotation.Resource;
import javax.jws.*;
@@ -20,9 +21,6 @@
import javax.xml.ws.handler.MessageContext;
import javax.servlet.http.HttpServletRequest;
-import org.jboss.jbossts.xts.soapfault.Fault;
-
-
/**
* This class was generated by the JAX-WS RI.
* JAX-WS RI 2.1.1-b03-
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionInitiatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionInitiatorClient.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionInitiatorClient.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -8,13 +8,13 @@
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import org.jboss.jbossts.xts.soapfault.Fault;
import org.jboss.wsf.common.addressing.MAPEndpoint;
import org.jboss.wsf.common.addressing.MAPBuilder;
import org.jboss.wsf.common.addressing.MAP;
import org.jboss.wsf.common.addressing.MAPBuilderFactory;
import org.oasis_open.docs.ws_tx.wsat._2006._06.CompletionInitiatorPortType;
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
+import org.xmlsoap.schemas.soap.envelope.Fault;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import java.io.IOException;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CoordinatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CoordinatorClient.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CoordinatorClient.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -8,13 +8,13 @@
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import org.jboss.jbossts.xts.soapfault.Fault;
import org.jboss.wsf.common.addressing.MAPEndpoint;
import org.jboss.wsf.common.addressing.MAPBuilder;
import org.jboss.wsf.common.addressing.MAP;
import org.jboss.wsf.common.addressing.MAPBuilderFactory;
import org.oasis_open.docs.ws_tx.wsat._2006._06.CoordinatorPortType;
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
+import org.xmlsoap.schemas.soap.envelope.Fault;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import java.io.IOException;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/ParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/ParticipantClient.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/ParticipantClient.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -8,13 +8,13 @@
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import org.jboss.jbossts.xts.soapfault.Fault;
import org.jboss.wsf.common.addressing.MAPEndpoint;
import org.jboss.wsf.common.addressing.MAPBuilder;
import org.jboss.wsf.common.addressing.MAP;
import org.jboss.wsf.common.addressing.MAPBuilderFactory;
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
import org.oasis_open.docs.ws_tx.wsat._2006._06.ParticipantPortType;
+import org.xmlsoap.schemas.soap.envelope.Fault;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import java.io.IOException;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionInitiatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionInitiatorPortTypeImpl.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionInitiatorPortTypeImpl.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -1,8 +1,6 @@
package com.arjuna.webservices11.wsat.sei;
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
-import org.oasis_open.docs.ws_tx.wsat._2006._06.CompletionInitiatorPortType;
-import org.jboss.jbossts.xts.soapfault.Fault;
import org.jboss.wsf.common.addressing.MAP;
import javax.jws.*;
@@ -20,6 +18,7 @@
import com.arjuna.services.framework.task.TaskManager;
import com.arjuna.services.framework.task.Task;
import com.arjuna.webservices.SoapFault;
+import org.xmlsoap.schemas.soap.envelope.Fault;
/**
* This class was generated by the JAX-WS RI.
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CoordinatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CoordinatorPortTypeImpl.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CoordinatorPortTypeImpl.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -1,8 +1,6 @@
package com.arjuna.webservices11.wsat.sei;
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
-import org.oasis_open.docs.ws_tx.wsat._2006._06.CoordinatorPortType;
-import org.jboss.jbossts.xts.soapfault.Fault;
import org.jboss.wsf.common.addressing.MAP;
import javax.jws.*;
@@ -20,6 +18,7 @@
import com.arjuna.services.framework.task.TaskManager;
import com.arjuna.services.framework.task.Task;
import com.arjuna.webservices.SoapFault;
+import org.xmlsoap.schemas.soap.envelope.Fault;
/**
* This class was generated by the JAX-WS RI.
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/ParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/ParticipantPortTypeImpl.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/ParticipantPortTypeImpl.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -1,8 +1,6 @@
package com.arjuna.webservices11.wsat.sei;
import org.oasis_open.docs.ws_tx.wsat._2006._06.Notification;
-import org.oasis_open.docs.ws_tx.wsat._2006._06.ParticipantPortType;
-import org.jboss.jbossts.xts.soapfault.Fault;
import org.jboss.wsf.common.addressing.MAP;
import javax.jws.*;
@@ -20,6 +18,7 @@
import com.arjuna.services.framework.task.TaskManager;
import com.arjuna.services.framework.task.Task;
import com.arjuna.webservices.SoapFault;
+import org.xmlsoap.schemas.soap.envelope.Fault;
/**
* This class was generated by the JAX-WS RI.
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionCoordinatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionCoordinatorClient.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionCoordinatorClient.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -23,13 +23,11 @@
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wsba.BusinessActivityConstants;
import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices11.wsba.client.WSBAClient;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import org.jboss.jbossts.xts.soapfault.Fault;
import org.jboss.wsf.common.addressing.MAPEndpoint;
import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithCoordinatorCompletionCoordinatorPortType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.ExceptionType;
@@ -38,6 +36,7 @@
import org.jboss.wsf.common.addressing.MAP;
import org.jboss.wsf.common.addressing.MAPBuilder;
import org.jboss.wsf.common.addressing.MAPBuilderFactory;
+import org.xmlsoap.schemas.soap.envelope.Fault;
import javax.xml.namespace.QName;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionParticipantClient.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionParticipantClient.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -23,13 +23,11 @@
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wsba.BusinessActivityConstants;
import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices11.wsba.client.WSBAClient;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import org.jboss.jbossts.xts.soapfault.Fault;
import org.jboss.wsf.common.addressing.MAPEndpoint;
import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithCoordinatorCompletionParticipantPortType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
@@ -37,6 +35,7 @@
import org.jboss.wsf.common.addressing.MAP;
import org.jboss.wsf.common.addressing.MAPBuilder;
import org.jboss.wsf.common.addressing.MAPBuilderFactory;
+import org.xmlsoap.schemas.soap.envelope.Fault;
import javax.xml.namespace.QName;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionCoordinatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionCoordinatorClient.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionCoordinatorClient.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -23,13 +23,11 @@
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wsba.BusinessActivityConstants;
import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices11.wsba.client.WSBAClient;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import org.jboss.jbossts.xts.soapfault.Fault;
import org.jboss.wsf.common.addressing.MAPEndpoint;
import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithParticipantCompletionCoordinatorPortType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.ExceptionType;
@@ -38,6 +36,7 @@
import org.jboss.wsf.common.addressing.MAP;
import org.jboss.wsf.common.addressing.MAPBuilder;
import org.jboss.wsf.common.addressing.MAPBuilderFactory;
+import org.xmlsoap.schemas.soap.envelope.Fault;
import javax.xml.namespace.QName;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionParticipantClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionParticipantClient.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/ParticipantCompletionParticipantClient.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -23,13 +23,11 @@
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wsba.BusinessActivityConstants;
import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices11.wsba.client.WSBAClient;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices11.wsaddr.NativeEndpointReference;
import com.arjuna.webservices11.wsaddr.EndpointHelper;
-import org.jboss.jbossts.xts.soapfault.Fault;
import org.jboss.wsf.common.addressing.MAPEndpoint;
import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithParticipantCompletionParticipantPortType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
@@ -37,6 +35,7 @@
import org.jboss.wsf.common.addressing.MAP;
import org.jboss.wsf.common.addressing.MAPBuilder;
import org.jboss.wsf.common.addressing.MAPBuilderFactory;
+import org.xmlsoap.schemas.soap.envelope.Fault;
import javax.xml.namespace.QName;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -9,11 +9,10 @@
import org.jboss.wsf.common.addressing.MAP;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices.SoapFault;
-import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithCoordinatorCompletionCoordinatorPortType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.ExceptionType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
-import org.jboss.jbossts.xts.soapfault.Fault;
+import org.xmlsoap.schemas.soap.envelope.Fault;
import javax.annotation.Resource;
import javax.jws.*;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -12,7 +12,7 @@
import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithCoordinatorCompletionParticipantPortType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
-import org.jboss.jbossts.xts.soapfault.Fault;
+import org.xmlsoap.schemas.soap.envelope.Fault;
import javax.annotation.Resource;
import javax.jws.*;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -9,11 +9,10 @@
import org.jboss.wsf.common.addressing.MAP;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices.SoapFault;
-import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithParticipantCompletionCoordinatorPortType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.ExceptionType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
-import org.jboss.jbossts.xts.soapfault.Fault;
+import org.xmlsoap.schemas.soap.envelope.Fault;
import javax.annotation.Resource;
import javax.jws.*;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -9,10 +9,9 @@
import org.jboss.wsf.common.addressing.MAP;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices.SoapFault;
-import org.oasis_open.docs.ws_tx.wsba._2006._06.BusinessAgreementWithParticipantCompletionParticipantPortType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.NotificationType;
import org.oasis_open.docs.ws_tx.wsba._2006._06.StatusType;
-import org.jboss.jbossts.xts.soapfault.Fault;
+import org.xmlsoap.schemas.soap.envelope.Fault;
import javax.annotation.Resource;
import javax.jws.*;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CompletionInitiatorPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CompletionInitiatorPortType.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CompletionInitiatorPortType.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -1,7 +1,7 @@
package org.oasis_open.docs.ws_tx.wsat._2006._06;
-import org.jboss.jbossts.xts.soapfault.Fault;
+import org.xmlsoap.schemas.soap.envelope.Fault;
import javax.jws.Oneway;
import javax.jws.WebMethod;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CoordinatorPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CoordinatorPortType.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CoordinatorPortType.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -1,7 +1,7 @@
package org.oasis_open.docs.ws_tx.wsat._2006._06;
-import org.jboss.jbossts.xts.soapfault.Fault;
+import org.xmlsoap.schemas.soap.envelope.Fault;
import javax.jws.Oneway;
import javax.jws.WebMethod;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/ParticipantPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/ParticipantPortType.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/ParticipantPortType.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -1,7 +1,7 @@
package org.oasis_open.docs.ws_tx.wsat._2006._06;
-import org.jboss.jbossts.xts.soapfault.Fault;
+import org.xmlsoap.schemas.soap.envelope.Fault;
import javax.jws.Oneway;
import javax.jws.WebMethod;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionCoordinatorPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionCoordinatorPortType.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionCoordinatorPortType.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -1,7 +1,7 @@
package org.oasis_open.docs.ws_tx.wsba._2006._06;
-import org.jboss.jbossts.xts.soapfault.Fault;
+import org.xmlsoap.schemas.soap.envelope.Fault;
import javax.jws.Oneway;
import javax.jws.WebMethod;
@@ -122,6 +122,6 @@
@WebMethod(operationName = "SoapFault", action = "http://docs.oasis-open.org/ws-tx/wscoor/2006/06/fault")
@Oneway
public void soapFault(
- @WebParam(name = "SoapFault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "parameters")
+ @WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "parameters")
Fault fault);
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionParticipantPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionParticipantPortType.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionParticipantPortType.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -1,7 +1,7 @@
package org.oasis_open.docs.ws_tx.wsba._2006._06;
-import org.jboss.jbossts.xts.soapfault.Fault;
+import org.xmlsoap.schemas.soap.envelope.Fault;
import javax.jws.Oneway;
import javax.jws.WebMethod;
@@ -122,6 +122,6 @@
@WebMethod(operationName = "SoapFault", action = "http://docs.oasis-open.org/ws-tx/wscoor/2006/06/fault")
@Oneway
public void soapFault(
- @WebParam(name = "SoapFault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "parameters")
+ @WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "parameters")
Fault fault);
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionCoordinatorPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionCoordinatorPortType.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionCoordinatorPortType.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -1,7 +1,7 @@
package org.oasis_open.docs.ws_tx.wsba._2006._06;
-import org.jboss.jbossts.xts.soapfault.Fault;
+import org.xmlsoap.schemas.soap.envelope.Fault;
import javax.jws.Oneway;
import javax.jws.WebMethod;
@@ -122,6 +122,6 @@
@WebMethod(operationName = "SoapFault", action = "http://docs.oasis-open.org/ws-tx/wscoor/2006/06/fault")
@Oneway
public void soapFault(
- @WebParam(name = "SoapFault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "parameters")
+ @WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "parameters")
Fault fault);
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionParticipantPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionParticipantPortType.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionParticipantPortType.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -1,7 +1,7 @@
package org.oasis_open.docs.ws_tx.wsba._2006._06;
-import org.jboss.jbossts.xts.soapfault.Fault;
+import org.xmlsoap.schemas.soap.envelope.Fault;
import javax.jws.Oneway;
import javax.jws.WebMethod;
@@ -112,6 +112,6 @@
@WebMethod(operationName = "SoapFault", action = "http://docs.oasis-open.org/ws-tx/wscoor/2006/06/fault")
@Oneway
public void soapFault(
- @WebParam(name = "SoapFault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "parameters")
+ @WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "parameters")
Fault fault);
}
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml 2010-07-05 13:25:11 UTC (rev 33740)
@@ -106,12 +106,18 @@
<fileset dir="${dd.dir}/sc007/"
includes="wsdl/sc007.wsdl"/>
</copy>
+ <copy toDir="${build.classes.dir}/org/jboss/jbossts/xts/soapfault"
+ overwrite="yes">
+ <fileset dir="${dd.dir}/soapfault/"
+ includes="wsdl/*"/>
+ </copy>
<war destfile="${build.war.file}" webxml="${build.webxml.file}">
<classes dir="${build.classes.dir}"/>
<classes dir="${src.dir}" excludes="**/*.java"/>
<!-- need to stop using this at some point soon -->
<lib dir="${jbossts.build.extlib.dir}" includes = "${xts.ext.libs}"/>
<webinf dir="${dd.dir}/sc007" includes="wsdl/sc007.wsdl"/>
+ <webinf dir="${dd.dir}/soapfault" includes="wsdl/*.wsdl wsdl/*.xsd"/>
<fileset dir="${web.dir}"/>
</war>
</target>
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/sc007/build.sh
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/sc007/build.sh 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/sc007/build.sh 2010-07-05 13:25:11 UTC (rev 33740)
@@ -35,4 +35,5 @@
rm -rf tmp/classes/* tmp/src/*
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/sc007.wsdl -d tmp/classes -s tmp/src -target 2.0 -p com.jboss.transaction.wstf.webservices.sc007.generated wsdl/sc007.wsdl
+#$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/sc007.wsdl -d tmp/classes -s tmp/src -target 2.0 -p com.jboss.transaction.wstf.webservices.sc007.generated wsdl/sc007.wsdl
+$JBOSS_HOME/bin/wsconsume.sh -v -k -w wsdl/sc007.wsdl -o tmp/classes -s tmp/src -p com.jboss.transaction.wstf.webservices.sc007.generated wsdl/sc007.wsdl
Added: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/soapfault/build.sh
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/soapfault/build.sh (rev 0)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/soapfault/build.sh 2010-07-05 13:25:11 UTC (rev 33740)
@@ -0,0 +1,23 @@
+#
+#
+#
+#
+
+if [ ! -d tmp ] ; then
+ mkdir tmp
+fi
+
+if [ ! -d tmp/classes ] ; then
+ mkdir tmp/classes
+fi
+
+if [ ! -d tmp/src ] ; then
+ mkdir tmp/src
+fi
+
+# delete old generated versions -- any changes should be made to a copy!
+
+rm -rf tmp/classes/* tmp/src/*
+
+# $GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/soapfault.wsdl -d tmp/classes -s tmp/src -target 2.1 -p org.jboss.jbossts.xts.soapfault wsdl/soapfault.wsdl
+$JBOSS_HOME/bin/wsconsume.sh -v -k -w wsdl/soapfault.wsdl -o tmp/classes -s tmp/src wsdl/soapfault.wsdl
Added: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/soapfault/wsdl/envelope.xsd
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/soapfault/wsdl/envelope.xsd (rev 0)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/soapfault/wsdl/envelope.xsd 2010-07-05 13:25:11 UTC (rev 33740)
@@ -0,0 +1,126 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!-- Schema for the SOAP/1.1 envelope
+
+Portions © 2001 DevelopMentor.
+© 2001 W3C (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved.
+
+This document is governed by the W3C Software License [1] as described in the FAQ [2].
+[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions:
+
+Permission to use, copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications, that you make:
+
+1. The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
+
+2. Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright © 2001 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/"
+
+3. Notice of any changes or modifications to the W3C files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
+
+Original W3C files; http://www.w3.org/2001/06/soap-envelope
+Changes made:
+ - reverted namespace to http://schemas.xmlsoap.org/soap/envelope/
+ - reverted mustUnderstand to only allow 0 and 1 as lexical values
+ - made encodingStyle a global attribute 20020825
+ - removed default value from mustUnderstand attribute declaration
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:tns="http://schemas.xmlsoap.org/soap/envelope/"
+ targetNamespace="http://schemas.xmlsoap.org/soap/envelope/" >
+
+
+ <!-- Envelope, header and body -->
+ <xs:element name="Envelope" type="tns:Envelope" />
+ <xs:complexType name="Envelope" >
+ <xs:sequence>
+ <xs:element ref="tns:Header" minOccurs="0" />
+ <xs:element ref="tns:Body" minOccurs="1" />
+ <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax" />
+ </xs:complexType>
+
+ <xs:element name="Header" type="tns:Header" />
+ <xs:complexType name="Header" >
+ <xs:sequence>
+ <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax" />
+ </xs:complexType>
+
+ <xs:element name="Body" type="tns:Body" />
+ <xs:complexType name="Body" >
+ <xs:sequence>
+ <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax" >
+ <xs:annotation>
+ <xs:documentation>
+ Prose in the spec does not specify that attributes are allowed on the Body element
+ </xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+
+ <!-- Global Attributes. The following attributes are intended to be usable via qualified attribute names on any complex type referencing them. -->
+ <xs:attribute name="mustUnderstand" >
+ <xs:simpleType>
+ <xs:restriction base='xs:boolean'>
+ <xs:pattern value='0|1' />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="actor" type="xs:anyURI" />
+
+ <xs:simpleType name="encodingStyle" >
+ <xs:annotation>
+ <xs:documentation>
+ 'encodingStyle' indicates any canonicalization conventions followed in the contents of the containing element. For example, the value 'http://schemas.xmlsoap.org/soap/encoding/' indicates the pattern described in SOAP specification
+ </xs:documentation>
+ </xs:annotation>
+ <xs:list itemType="xs:anyURI" />
+ </xs:simpleType>
+
+ <xs:attribute name="encodingStyle" type="tns:encodingStyle" />
+ <xs:attributeGroup name="encodingStyle" >
+ <xs:attribute ref="tns:encodingStyle" />
+ </xs:attributeGroup>
+
+ <xs:element name="Fault" type="tns:Fault" />
+ <xs:complexType name="Fault" final="extension" >
+ <xs:annotation>
+ <xs:documentation>
+ Fault reporting structure
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="faultcode" type="xs:QName" />
+ <xs:element name="faultstring" type="xs:string" />
+ <xs:element name="faultactor" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="detail" type="tns:detail" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="detail">
+ <xs:sequence>
+ <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax" />
+ </xs:complexType>
+
+</xs:schema>
+
+
+
+
+
+
Added: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/soapfault/wsdl/soapfault.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/soapfault/wsdl/soapfault.wsdl (rev 0)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/dd/soapfault/wsdl/soapfault.wsdl 2010-07-05 13:25:11 UTC (rev 33740)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ a specification for a service which can be used to dispatch a SOAP 1.1 SoapFault
+ to an arbitrary client
+-->
+<definitions
+ xmlns:s="http://www.w3.org/2001/XMLSchema"
+ xmlns:tns="http://jbossts.jboss.org/xts/soapfault"
+ xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsaw="http://www.w3.org/2006/02/addressing/wsdl"
+ targetNamespace="http://jbossts.jboss.org/xts/soapfault"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <types>
+ <s:schema>
+<!--
+ <s:import namespace="http://schemas.xmlsoap.org/soap/envelope/"
+ schemaLocation="http://schemas.xmlsoap.org/soap/envelope/"
+ />
+-->
+ <s:import namespace="http://schemas.xmlsoap.org/soap/envelope/"
+ schemaLocation="envelope.xsd"
+ />
+
+ </s:schema>
+ </types>
+ <message name="SoapFault">
+ <part name="fault" element="soapenv:Fault" />
+ </message>
+
+ <portType name="SoapFaultPortType">
+ <operation name="SoapFault">
+ <input message="tns:SoapFault" />
+ </operation>
+ </portType>
+
+ <binding name="SoapFault_SOAPBinding" type="tns:SoapFaultPortType">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="SoapFault">
+ <input message="tns:SoapFault">
+ <soap:body use="literal"/>
+ </input>
+ </operation>
+ </binding>
+
+ <service name="SoapFaultService">
+ <port binding="tns:SoapFault_SOAPBinding" name="SoapFaultPortType">
+ <wsaw:UsingAddressing required="true"/>
+ <soap:address location="http://localhost:9000/interopat/SoapFaultService"/>
+ </port>
+ </service>
+
+</definitions>
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InitiatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InitiatorClient.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/client/InitiatorClient.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -25,7 +25,7 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
-import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
+import com.jboss.transaction.wstf.webservices.soapfault.client.SoapFaultClient;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import org.jboss.wsf.common.addressing.MAP;
import com.arjuna.wsc11.messaging.MessageId;
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/InitiatorPortTypeImpl.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -21,10 +21,10 @@
package com.jboss.transaction.wstf.webservices.sc007.sei;
import com.jboss.transaction.wstf.webservices.sc007.processors.InitiatorProcessor;
-import com.jboss.transaction.wstf.webservices.sc007.generated.InitiatorPortType;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import org.jboss.wsf.common.addressing.MAP;
+import org.xmlsoap.schemas.soap.envelope.Fault;
import javax.xml.ws.Action;
import javax.xml.ws.RequestWrapper;
@@ -42,19 +42,17 @@
import javax.jws.WebParam;
import javax.jws.soap.SOAPBinding;
-import org.jboss.jbossts.xts.soapfault.Fault;
-import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
-
/**
* Implementation class for WSTX 1.1 AT Interop Test Initiator service
*/
@WebService(name = "InitiatorPortType",
targetNamespace = "http://www.wstf.org/sc007",
- wsdlLocation="/WEB-INF/wsdl/sc007.wsdl",
+ // wsdlLocation="/WEB-INF/wsdl/sc007.wsdl",
portName = "sc007InitiatorPort",
serviceName="sc007Service")
@Addressing(required=true)
-public class InitiatorPortTypeImpl implements InitiatorPortType, SoapFaultPortType {
+public class InitiatorPortTypeImpl // implements InitiatorPortType, SoapFaultPortType
+{
/**
* injected resource providing access to WSA addressing properties
@@ -68,7 +66,7 @@
@WebMethod(operationName = "Response", action = "http://www.wstf.org/docs/scenarios/sc007/Response")
@Oneway
@Action(input="http://www.wstf.org/docs/scenarios/sc007/Response")
- @RequestWrapper(localName = "Response", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+ @RequestWrapper(localName = "Response", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
public void response()
{
MessageContext ctx = webServiceCtx.getMessageContext();
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/sc007/sei/ParticipantPortTypeImpl.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -22,12 +22,9 @@
import com.jboss.transaction.wstf.webservices.sc007.processors.ParticipantProcessor;
import com.jboss.transaction.wstf.webservices.sc007.client.InitiatorClient;
-import com.jboss.transaction.wstf.webservices.sc007.generated.ParticipantPortType;
import com.jboss.transaction.wstf.webservices.CoordinationContextManager;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import org.jboss.wsf.common.addressing.MAP;
-import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
-import org.jboss.jbossts.xts.soapfault.Fault;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.wsc11.messaging.MessageId;
@@ -42,6 +39,7 @@
import javax.annotation.Resource;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import org.xmlsoap.schemas.soap.envelope.Fault;
/**
* Implementation class for WSTX 1.1 AT Interop Test Initiator service
@@ -49,11 +47,12 @@
@WebService(name = "ParticipantPortType",
targetNamespace = "http://www.wstf.org/sc007",
portName="sc007ParticipantPort",
- wsdlLocation="/WEB-INF/wsdl/sc007.wsdl",
+ // wsdlLocation="/WEB-INF/wsdl/sc007.wsdl",
serviceName="sc007Service")
@Addressing(required=true)
@HandlerChain(file="participanthandlers.xml")
-public class ParticipantPortTypeImpl implements ParticipantPortType, SoapFaultPortType {
+public class ParticipantPortTypeImpl // implements ParticipantPortType, SoapFaultPortType
+{
/**
* injected resource providing access to WSA addressing properties
@@ -113,7 +112,7 @@
@WebMethod(operationName = "Commit", action = "http://www.wstf.org/docs/scenarios/sc007/Commit")
@Oneway
@Action(input="http://www.wstf.org/docs/scenarios/sc007/Commit")
- @RequestWrapper(localName = "Commit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+ @RequestWrapper(localName = "Commit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
public void commit()
{
MessageContext ctx = webServiceCtx.getMessageContext();
@@ -134,7 +133,7 @@
@WebMethod(operationName = "Rollback", action = "http://www.wstf.org/docs/scenarios/sc007/Rollback")
@Oneway
@Action(input="http://www.wstf.org/docs/scenarios/sc007/Rollback")
- @RequestWrapper(localName = "Rollback", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+ @RequestWrapper(localName = "Rollback", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
public void rollback()
{
MessageContext ctx = webServiceCtx.getMessageContext();
@@ -155,7 +154,7 @@
@WebMethod(operationName = "Phase2Rollback", action = "http://www.wstf.org/docs/scenarios/sc007/Phase2Rollback")
@Oneway
@Action(input="http://www.wstf.org/docs/scenarios/sc007/Phase2Rollback")
- @RequestWrapper(localName = "Phase2Rollback", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+ @RequestWrapper(localName = "Phase2Rollback", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
public void phase2Rollback()
{
MessageContext ctx = webServiceCtx.getMessageContext();
@@ -176,7 +175,7 @@
@WebMethod(operationName = "Readonly", action = "http://www.wstf.org/docs/scenarios/sc007/Readonly")
@Oneway
@Action(input="http://www.wstf.org/docs/scenarios/sc007/Readonly")
- @RequestWrapper(localName = "Readonly", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+ @RequestWrapper(localName = "Readonly", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
public void readonly()
{
MessageContext ctx = webServiceCtx.getMessageContext();
@@ -197,7 +196,7 @@
@WebMethod(operationName = "VolatileAndDurable", action = "http://www.wstf.org/docs/scenarios/sc007/VolatileAndDurable")
@Oneway
@Action(input="http://www.wstf.org/docs/scenarios/sc007/VolatileAndDurable")
- @RequestWrapper(localName = "VolatileAndDurable", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+ @RequestWrapper(localName = "VolatileAndDurable", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
public void volatileAndDurable()
{
MessageContext ctx = webServiceCtx.getMessageContext();
@@ -218,7 +217,7 @@
@WebMethod(operationName = "EarlyReadonly", action = "http://www.wstf.org/docs/scenarios/sc007/EarlyReadonly")
@Oneway
@Action(input="http://www.wstf.org/docs/scenarios/sc007/EarlyReadonly")
- @RequestWrapper(localName = "EarlyReadonly", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+ @RequestWrapper(localName = "EarlyReadonly", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
public void earlyReadonly()
{
MessageContext ctx = webServiceCtx.getMessageContext();
@@ -239,7 +238,7 @@
@WebMethod(operationName = "EarlyAborted", action = "http://www.wstf.org/docs/scenarios/sc007/EarlyAborted")
@Oneway
@Action(input="http://www.wstf.org/docs/scenarios/sc007/EarlyAborted")
- @RequestWrapper(localName = "EarlyAborted", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+ @RequestWrapper(localName = "EarlyAborted", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
public void earlyAborted()
{
MessageContext ctx = webServiceCtx.getMessageContext();
@@ -260,7 +259,7 @@
@WebMethod(operationName = "ReplayCommit", action = "http://www.wstf.org/docs/scenarios/sc007/ReplayCommit")
@Oneway
@Action(input="http://www.wstf.org/docs/scenarios/sc007/ReplayCommit")
- @RequestWrapper(localName = "ReplayCommit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+ @RequestWrapper(localName = "ReplayCommit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
public void replayCommit()
{
MessageContext ctx = webServiceCtx.getMessageContext();
@@ -281,7 +280,7 @@
@WebMethod(operationName = "RetryPreparedCommit", action = "http://www.wstf.org/docs/scenarios/sc007/RetryPreparedCommit")
@Oneway
@Action(input="http://www.wstf.org/docs/scenarios/sc007/RetryPreparedCommit")
- @RequestWrapper(localName = "RetryPreparedCommit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+ @RequestWrapper(localName = "RetryPreparedCommit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
public void retryPreparedCommit()
{
MessageContext ctx = webServiceCtx.getMessageContext();
@@ -302,7 +301,7 @@
@WebMethod(operationName = "RetryPreparedAbort", action = "http://www.wstf.org/docs/scenarios/sc007/RetryPreparedAbort")
@Oneway
@Action(input="http://www.wstf.org/docs/scenarios/sc007/RetryPreparedAbort")
- @RequestWrapper(localName = "RetryPreparedAbort", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+ @RequestWrapper(localName = "RetryPreparedAbort", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
public void retryPreparedAbort()
{
MessageContext ctx = webServiceCtx.getMessageContext();
@@ -323,7 +322,7 @@
@WebMethod(operationName = "RetryCommit", action = "http://www.wstf.org/docs/scenarios/sc007/RetryCommit")
@Oneway
@Action(input="http://www.wstf.org/docs/scenarios/sc007/RetryCommit")
- @RequestWrapper(localName = "RetryCommit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+ @RequestWrapper(localName = "RetryCommit", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
public void retryCommit()
{
MessageContext ctx = webServiceCtx.getMessageContext();
@@ -344,7 +343,7 @@
@WebMethod(operationName = "PreparedAfterTimeout", action = "http://www.wstf.org/docs/scenarios/sc007/PreparedAfterTimeout")
@Oneway
@Action(input="http://www.wstf.org/docs/scenarios/sc007/PreparedAfterTimeout")
- @RequestWrapper(localName = "PreparedAfterTimeout", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+ @RequestWrapper(localName = "PreparedAfterTimeout", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
public void preparedAfterTimeout()
{
MessageContext ctx = webServiceCtx.getMessageContext();
@@ -365,7 +364,7 @@
@WebMethod(operationName = "LostCommitted", action = "http://www.wstf.org/docs/scenarios/sc007/LostCommitted")
@Oneway
@Action(input="http://www.wstf.org/docs/scenarios/sc007/LostCommitted")
- @RequestWrapper(localName = "LostCommitted", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.txinterop.webservices.sc007.generated.TestMessageType")
+ @RequestWrapper(localName = "LostCommitted", targetNamespace = "http://www.wstf.org/sc007", className = "com.jboss.transaction.wstf.webservices.sc007.generated.TestMessageType")
public void lostCommitted()
{
MessageContext ctx = webServiceCtx.getMessageContext();
@@ -393,7 +392,7 @@
InitiatorClient.getClient().sendResponse(outboundAddressProperties);
} catch (Throwable th) {
String to = outboundAddressProperties.getTo();
- System.out.println("com.jboss.transaction.txinterop.webservices.sc007.sei.ParticipantPortTypeImpl_1: unable to send response to " + to);
+ System.out.println("com.jboss.transaction.wstf.webservices.sc007.sei.ParticipantPortTypeImpl_1: unable to send response to " + to);
throw new ProtocolException(th);
}
}
@@ -408,7 +407,7 @@
try {
InitiatorClient.getClient().sendSoapFault(inboundMap, sf);
} catch (Throwable th) {
- System.out.println("com.jboss.transaction.txinterop.webservices.sc007.sei.ParticipantPortTypeImpl_2: unable to log soap fault " + sf);
+ System.out.println("com.jboss.transaction.wstf.webservices.sc007.sei.ParticipantPortTypeImpl_2: unable to log soap fault " + sf);
throw new ProtocolException(th);
}
}
@@ -420,6 +419,6 @@
{
// hmm, probably ought not to happen -- just log this as an error
SoapFault11 soapFaultInternal = SoapFault11.fromFault(fault);
- System.out.println("com.jboss.transaction.txinterop.webservices.sc007.sei.ParticipantPortTypeImpl_3: unexpected soap fault " + soapFaultInternal);
+ System.out.println("com.jboss.transaction.wstf.webservices.sc007.sei.ParticipantPortTypeImpl_3: unexpected soap fault " + soapFaultInternal);
}
}
Copied: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/soapfault/client/SoapFaultClient.java (from rev 33730, labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/client/SoapFaultClient.java)
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/soapfault/client/SoapFaultClient.java (rev 0)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/com/jboss/transaction/wstf/webservices/soapfault/client/SoapFaultClient.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -0,0 +1,130 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a full listing
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.wstf.webservices.soapfault.client;
+
+import com.arjuna.webservices11.SoapFault11;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
+import org.jboss.wsf.common.addressing.MAP;
+import org.xmlsoap.schemas.soap.envelope.Fault;
+
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.soap.AddressingFeature;
+import javax.xml.ws.wsaddressing.W3CEndpointReference;
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * Base client.
+ * @author kevin
+ */
+public class SoapFaultClient
+{
+ /**
+ * Send a fault.
+ * @param soapFault The SOAP fault.
+ * @param map addressing context initialised with to and message ID.
+ * @param action The action URI for the request.
+ * @throws com.arjuna.webservices.SoapFault For any errors.
+ * @throws java.io.IOException for any transport errors.
+ */
+ public static void sendSoapFault(final SoapFault11 soapFault,
+ final MAP map,
+ final String action)
+ throws SoapFault11, IOException
+ {
+ if (action != null)
+ {
+ soapFault.setAction(action) ;
+ }
+
+ final SoapFaultPortType faultPort = getSoapFaultPort(map, action);
+ Fault fault = soapFault.toFault();
+ faultPort.soapFault(fault);
+ }
+
+ /**
+ * fetch a coordinator activation service unique to the current thread
+ * @return
+ */
+ private static synchronized org.jboss.jbossts.xts.soapfault.SoapFaultService getSoapFaultService()
+ {
+ if (soapFaultService.get() == null) {
+ // we don't supply wsdl on the client side -- we want this client to address the various
+ // different versions of the service which bind the fault WebMethod using different
+ // soap actions. the annotations on the service and port supply all the info needed
+ // to create the service and port on the client side.
+ // soapFaultService.set(new SoapFaultService(null, new QName("http://jbossts.jboss.org/xts/soapfault", "SoapFaultService")));
+ soapFaultService.set(new org.jboss.jbossts.xts.soapfault.SoapFaultService());
+ }
+ return soapFaultService.get();
+ }
+
+ private static org.jboss.jbossts.xts.soapfault.SoapFaultPortType getSoapFaultPort(final MAP map,
+ final String action)
+ {
+ org.jboss.jbossts.xts.soapfault.SoapFaultService service = getSoapFaultService();
+ org.jboss.jbossts.xts.soapfault.SoapFaultPortType port = service.getPort(org.jboss.jbossts.xts.soapfault.SoapFaultPortType.class, new AddressingFeature(true, true));
+ BindingProvider bindingProvider = (BindingProvider)port;
+ String to = map.getTo();
+ /*
+ * we no longer have to add the JaxWS WSAddressingClientHandler because we can specify the WSAddressing feature
+ List<Handler> customHandlerChain = new ArrayList<Handler>();
+ customHandlerChain.add(new WSAddressingClientHandler());
+ bindingProvider.getBinding().setHandlerChain(customHandlerChain);
+ */
+
+ Map<String, Object> requestContext = bindingProvider.getRequestContext();
+ if (action != null) {
+ map.setAction(action);
+ }
+ AddressingHelper.configureRequestContext(requestContext, map, to, action);
+
+ return port;
+ }
+
+ private static org.jboss.jbossts.xts.soapfault.SoapFaultPortType getSoapFaultPort(final W3CEndpointReference endpoint,
+ final MAP map,
+ final String action)
+ {
+ org.jboss.jbossts.xts.soapfault.SoapFaultService service = getSoapFaultService();
+ org.jboss.jbossts.xts.soapfault.SoapFaultPortType port = service.getPort(endpoint, org.jboss.jbossts.xts.soapfault.SoapFaultPortType.class, new AddressingFeature(true, true));
+ BindingProvider bindingProvider = (BindingProvider)port;
+ Map<String, Object> requestContext = bindingProvider.getRequestContext();
+ MAP requestMap = AddressingHelper.outboundMap(requestContext);
+ if (action != null) {
+ map.setAction(action);
+ }
+ AddressingHelper.installCallerProperties(map, requestMap);
+ String to = requestMap.getTo();
+ /*
+ * we no longer have to add the JaxWS WSAddressingClientHandler because we can specify the WSAddressing feature
+ List<Handler> customHandlerChain = new ArrayList<Handler>();
+ customHandlerChain.add(new WSAddressingClientHandler());
+ bindingProvider.getBinding().setHandlerChain(customHandlerChain);
+ */
+ AddressingHelper.configureRequestContext(requestContext, to, action);
+
+ return port;
+ }
+
+ private static final ThreadLocal<org.jboss.jbossts.xts.soapfault.SoapFaultService> soapFaultService = new ThreadLocal<org.jboss.jbossts.xts.soapfault.SoapFaultService>();
+}
\ No newline at end of file
Added: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/org/jboss/jbossts/xts/soapfault/SoapFaultPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/org/jboss/jbossts/xts/soapfault/SoapFaultPortType.java (rev 0)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/org/jboss/jbossts/xts/soapfault/SoapFaultPortType.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -0,0 +1,35 @@
+
+package org.jboss.jbossts.xts.soapfault;
+
+import org.xmlsoap.schemas.soap.envelope.Fault;
+
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.bind.annotation.XmlSeeAlso;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.2-hudson-182-RC1
+ * Generated source version: 2.1
+ *
+ */
+ at WebService(name = "SoapFaultPortType", targetNamespace = "http://jbossts.jboss.org/xts/soapfault")
+ at SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+public interface SoapFaultPortType {
+
+
+ /**
+ *
+ * @param fault
+ */
+ @WebMethod(operationName = "SoapFault")
+ @Oneway
+ public void soapFault(
+ @WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "fault")
+ Fault fault);
+
+}
Added: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/org/jboss/jbossts/xts/soapfault/SoapFaultService.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/org/jboss/jbossts/xts/soapfault/SoapFaultService.java (rev 0)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/src/org/jboss/jbossts/xts/soapfault/SoapFaultService.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -0,0 +1,73 @@
+
+package org.jboss.jbossts.xts.soapfault;
+
+import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.logging.Logger;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+import javax.xml.ws.WebServiceFeature;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.2-hudson-182-RC1
+ * Generated source version: 2.1
+ *
+ */
+ at WebServiceClient(name = "SoapFaultService", targetNamespace = "http://jbossts.jboss.org/xts/soapfault", wsdlLocation = "wsdl/soapfault.wsdl")
+public class SoapFaultService
+ extends Service
+{
+
+ private final static URL SOAPFAULTSERVICE_WSDL_LOCATION;
+ private final static Logger logger = Logger.getLogger(org.jboss.jbossts.xts.soapfault.SoapFaultService.class.getName());
+
+ static {
+ URL url = null;
+ try {
+ URL baseUrl;
+ baseUrl = org.jboss.jbossts.xts.soapfault.SoapFaultService.class.getResource(".");
+ url = new URL(baseUrl, "wsdl/soapfault.wsdl");
+ } catch (MalformedURLException e) {
+ logger.warning("Failed to create URL for the wsdl Location: 'wsdl/soapfault.wsdl', retrying as a local file");
+ logger.warning(e.getMessage());
+ }
+ SOAPFAULTSERVICE_WSDL_LOCATION = url;
+ }
+
+ public SoapFaultService(URL wsdlLocation, QName serviceName) {
+ super(wsdlLocation, serviceName);
+ }
+
+ public SoapFaultService() {
+ super(SOAPFAULTSERVICE_WSDL_LOCATION, new QName("http://jbossts.jboss.org/xts/soapfault", "SoapFaultService"));
+ }
+
+ /**
+ *
+ * @return
+ * returns SoapFaultPortType
+ */
+ @WebEndpoint(name = "SoapFaultPortType")
+ public SoapFaultPortType getSoapFaultPortType() {
+ return super.getPort(new QName("http://jbossts.jboss.org/xts/soapfault", "SoapFaultPortType"), SoapFaultPortType.class);
+ }
+
+ /**
+ *
+ * @param features
+ * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
+ * @return
+ * returns SoapFaultPortType
+ */
+ @WebEndpoint(name = "SoapFaultPortType")
+ public SoapFaultPortType getSoapFaultPortType(WebServiceFeature... features) {
+ return super.getPort(new QName("http://jbossts.jboss.org/xts/soapfault", "SoapFaultPortType"), org.jboss.jbossts.xts.soapfault.SoapFaultPortType.class, features);
+ }
+
+}
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml 2010-07-05 13:25:11 UTC (rev 33740)
@@ -116,10 +116,16 @@
<fileset dir="${dd.dir}/interop11"
includes="wsdl/soapfault.wsdl"/>
</copy>
+ <copy toDir="${build.classes.dir}/org/jboss/jbossts/xts/soapfault"
+ overwrite="yes">
+ <fileset dir="${dd.dir}/soapfault/"
+ includes="wsdl/*"/>
+ </copy>
<war destfile="${build.war.file}" webxml="${build.webxml.file}">
<classes dir="${build.classes.dir}"/>
<classes dir="${src.dir}" excludes="**/*.java"/>
<webinf dir="${dd.dir}/interop11" includes="wsdl/*.wsdl"/>
+ <webinf dir="${dd.dir}/soapfault" includes="wsdl/*.wsdl wsdl/*.xsd"/>
<fileset dir="${web.dir}"/>
<!-- need to stop using this at some point soon -->
<lib dir="${jbossts.build.extlib.dir}" includes = "${xts.ext.libs}"/>
Added: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/soapfault/build.sh
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/soapfault/build.sh (rev 0)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/soapfault/build.sh 2010-07-05 13:25:11 UTC (rev 33740)
@@ -0,0 +1,23 @@
+#
+#
+#
+#
+
+if [ ! -d tmp ] ; then
+ mkdir tmp
+fi
+
+if [ ! -d tmp/classes ] ; then
+ mkdir tmp/classes
+fi
+
+if [ ! -d tmp/src ] ; then
+ mkdir tmp/src
+fi
+
+# delete old generated versions -- any changes should be made to a copy!
+
+rm -rf tmp/classes/* tmp/src/*
+
+# $GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/soapfault.wsdl -d tmp/classes -s tmp/src -target 2.1 -p org.jboss.jbossts.xts.soapfault wsdl/soapfault.wsdl
+$JBOSS_HOME/bin/wsconsume.sh -v -k -w wsdl/soapfault.wsdl -o tmp/classes -s tmp/src wsdl/soapfault.wsdl
Added: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/soapfault/wsdl/envelope.xsd
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/soapfault/wsdl/envelope.xsd (rev 0)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/soapfault/wsdl/envelope.xsd 2010-07-05 13:25:11 UTC (rev 33740)
@@ -0,0 +1,126 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!-- Schema for the SOAP/1.1 envelope
+
+Portions © 2001 DevelopMentor.
+© 2001 W3C (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved.
+
+This document is governed by the W3C Software License [1] as described in the FAQ [2].
+[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions:
+
+Permission to use, copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications, that you make:
+
+1. The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
+
+2. Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright © 2001 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/"
+
+3. Notice of any changes or modifications to the W3C files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
+
+Original W3C files; http://www.w3.org/2001/06/soap-envelope
+Changes made:
+ - reverted namespace to http://schemas.xmlsoap.org/soap/envelope/
+ - reverted mustUnderstand to only allow 0 and 1 as lexical values
+ - made encodingStyle a global attribute 20020825
+ - removed default value from mustUnderstand attribute declaration
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:tns="http://schemas.xmlsoap.org/soap/envelope/"
+ targetNamespace="http://schemas.xmlsoap.org/soap/envelope/" >
+
+
+ <!-- Envelope, header and body -->
+ <xs:element name="Envelope" type="tns:Envelope" />
+ <xs:complexType name="Envelope" >
+ <xs:sequence>
+ <xs:element ref="tns:Header" minOccurs="0" />
+ <xs:element ref="tns:Body" minOccurs="1" />
+ <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax" />
+ </xs:complexType>
+
+ <xs:element name="Header" type="tns:Header" />
+ <xs:complexType name="Header" >
+ <xs:sequence>
+ <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax" />
+ </xs:complexType>
+
+ <xs:element name="Body" type="tns:Body" />
+ <xs:complexType name="Body" >
+ <xs:sequence>
+ <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax" >
+ <xs:annotation>
+ <xs:documentation>
+ Prose in the spec does not specify that attributes are allowed on the Body element
+ </xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
+ </xs:complexType>
+
+
+ <!-- Global Attributes. The following attributes are intended to be usable via qualified attribute names on any complex type referencing them. -->
+ <xs:attribute name="mustUnderstand" >
+ <xs:simpleType>
+ <xs:restriction base='xs:boolean'>
+ <xs:pattern value='0|1' />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="actor" type="xs:anyURI" />
+
+ <xs:simpleType name="encodingStyle" >
+ <xs:annotation>
+ <xs:documentation>
+ 'encodingStyle' indicates any canonicalization conventions followed in the contents of the containing element. For example, the value 'http://schemas.xmlsoap.org/soap/encoding/' indicates the pattern described in SOAP specification
+ </xs:documentation>
+ </xs:annotation>
+ <xs:list itemType="xs:anyURI" />
+ </xs:simpleType>
+
+ <xs:attribute name="encodingStyle" type="tns:encodingStyle" />
+ <xs:attributeGroup name="encodingStyle" >
+ <xs:attribute ref="tns:encodingStyle" />
+ </xs:attributeGroup>
+
+ <xs:element name="Fault" type="tns:Fault" />
+ <xs:complexType name="Fault" final="extension" >
+ <xs:annotation>
+ <xs:documentation>
+ Fault reporting structure
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="faultcode" type="xs:QName" />
+ <xs:element name="faultstring" type="xs:string" />
+ <xs:element name="faultactor" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="detail" type="tns:detail" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="detail">
+ <xs:sequence>
+ <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+ </xs:sequence>
+ <xs:anyAttribute namespace="##any" processContents="lax" />
+ </xs:complexType>
+
+</xs:schema>
+
+
+
+
+
+
Added: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/soapfault/wsdl/soapfault.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/soapfault/wsdl/soapfault.wsdl (rev 0)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/dd/soapfault/wsdl/soapfault.wsdl 2010-07-05 13:25:11 UTC (rev 33740)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ a specification for a service which can be used to dispatch a SOAP 1.1 SoapFault
+ to an arbitrary client
+-->
+<definitions
+ xmlns:s="http://www.w3.org/2001/XMLSchema"
+ xmlns:tns="http://jbossts.jboss.org/xts/soapfault"
+ xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsaw="http://www.w3.org/2006/02/addressing/wsdl"
+ targetNamespace="http://jbossts.jboss.org/xts/soapfault"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <types>
+ <s:schema>
+<!--
+ <s:import namespace="http://schemas.xmlsoap.org/soap/envelope/"
+ schemaLocation="http://schemas.xmlsoap.org/soap/envelope/"
+ />
+-->
+ <s:import namespace="http://schemas.xmlsoap.org/soap/envelope/"
+ schemaLocation="envelope.xsd"
+ />
+
+ </s:schema>
+ </types>
+ <message name="SoapFault">
+ <part name="fault" element="soapenv:Fault" />
+ </message>
+
+ <portType name="SoapFaultPortType">
+ <operation name="SoapFault">
+ <input message="tns:SoapFault" />
+ </operation>
+ </portType>
+
+ <binding name="SoapFault_SOAPBinding" type="tns:SoapFaultPortType">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="SoapFault">
+ <input message="tns:SoapFault">
+ <soap:body use="literal"/>
+ </input>
+ </operation>
+ </binding>
+
+ <service name="SoapFaultService">
+ <port binding="tns:SoapFault_SOAPBinding" name="SoapFaultPortType">
+ <wsaw:UsingAddressing required="true"/>
+ <soap:address location="http://localhost:9000/interopat/SoapFaultService"/>
+ </port>
+ </service>
+
+</definitions>
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -25,7 +25,7 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
-import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
+import com.jboss.transaction.txinterop.webservices.soapfault.client.SoapFaultClient;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import org.jboss.wsf.common.addressing.MAP;
import com.arjuna.wsc11.messaging.MessageId;
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/InitiatorPortTypeImpl.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -21,10 +21,10 @@
package com.jboss.transaction.txinterop.webservices.atinterop.sei;
import com.jboss.transaction.txinterop.webservices.atinterop.processors.ATInitiatorProcessor;
-import com.jboss.transaction.txinterop.webservices.atinterop.generated.InitiatorPortType;
import com.arjuna.webservices11.SoapFault11;
import org.jboss.wsf.common.addressing.MAP;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import org.xmlsoap.schemas.soap.envelope.Fault;
import javax.xml.ws.Action;
import javax.xml.ws.RequestWrapper;
@@ -41,8 +41,6 @@
import javax.jws.WebService;
import javax.jws.WebParam;
import javax.jws.soap.SOAPBinding;
-import org.jboss.jbossts.xts.soapfault.Fault;
-import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
/**
* Implementation class for WSTX 1.1 AT Interop Test Initiator service
@@ -50,10 +48,11 @@
@WebService(name = "InitiatorPortType",
targetNamespace = "http://fabrikam123.com",
portName = "InitiatorPortType",
- wsdlLocation="/WEB-INF/wsdl/interopat-initiator-binding.wsdl",
+ // wsdlLocation="/WEB-INF/wsdl/interopat-initiator-binding.wsdl",
serviceName="InitiatorService")
@Addressing(required=true)
-public class InitiatorPortTypeImpl implements InitiatorPortType, SoapFaultPortType {
+public class InitiatorPortTypeImpl // implements InitiatorPortType, SoapFaultPortType
+{
/**
* injected resource providing access to WSA addressing properties
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -22,12 +22,9 @@
import com.jboss.transaction.txinterop.webservices.atinterop.processors.ATParticipantProcessor;
import com.jboss.transaction.txinterop.webservices.atinterop.client.InitiatorClient;
-import com.jboss.transaction.txinterop.webservices.atinterop.generated.ParticipantPortType;
import com.jboss.transaction.txinterop.webservices.CoordinationContextManager;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import org.jboss.wsf.common.addressing.MAP;
-import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
-import org.jboss.jbossts.xts.soapfault.Fault;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.wsc11.messaging.MessageId;
@@ -42,6 +39,7 @@
import javax.annotation.Resource;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import org.xmlsoap.schemas.soap.envelope.Fault;
/**
* Implementation class for WSTX 1.1 AT Interop Test Initiator service
@@ -49,11 +47,12 @@
@WebService(name = "ParticipantPortType",
targetNamespace = "http://fabrikam123.com",
portName="ParticipantPortType",
- wsdlLocation="/WEB-INF/wsdl/interopat-participant-binding.wsdl",
+ // wsdlLocation="/WEB-INF/wsdl/interopat-participant-binding.wsdl",
serviceName="ParticipantService")
@Addressing(required=true)
@HandlerChain(file="participanthandlers.xml")
-public class ParticipantPortTypeImpl implements ParticipantPortType, SoapFaultPortType {
+public class ParticipantPortTypeImpl // implements ParticipantPortType, SoapFaultPortType
+{
/**
* injected resource providing access to WSA addressing properties
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -23,7 +23,7 @@
import java.io.IOException;
import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
+import com.jboss.transaction.txinterop.webservices.soapfault.client.SoapFaultClient;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import org.jboss.wsf.common.addressing.MAP;
import com.arjuna.webservices11.SoapFault11;
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/InitiatorPortTypeImpl.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -21,12 +21,10 @@
package com.jboss.transaction.txinterop.webservices.bainterop.sei;
import com.jboss.transaction.txinterop.webservices.bainterop.processors.BAInitiatorProcessor;
-import com.jboss.transaction.txinterop.webservices.bainterop.generated.InitiatorPortType;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import com.arjuna.webservices11.SoapFault11;
import org.jboss.wsf.common.addressing.MAP;
-import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
-import org.jboss.jbossts.xts.soapfault.Fault;
+import org.xmlsoap.schemas.soap.envelope.Fault;
import javax.xml.ws.Action;
import javax.xml.ws.RequestWrapper;
@@ -49,10 +47,11 @@
@WebService(name = "InitiatorPortType",
targetNamespace = "http://fabrikam123.com/wsba",
portName = "InitiatorPortType",
- wsdlLocation="/WEB-INF/wsdl/interopba-initiator-binding.wsdl",
+ // wsdlLocation="/WEB-INF/wsdl/interopba-initiator-binding.wsdl",
serviceName="InitiatorService")
@Addressing(required=true)
-public class InitiatorPortTypeImpl implements InitiatorPortType, SoapFaultPortType {
+public class InitiatorPortTypeImpl // implements InitiatorPortType, SoapFaultPortType
+{
/**
* injected resource providing access to WSA addressing properties
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java 2010-07-05 00:32:25 UTC (rev 33739)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -22,12 +22,9 @@
import com.jboss.transaction.txinterop.webservices.bainterop.client.InitiatorClient;
import com.jboss.transaction.txinterop.webservices.bainterop.processors.BAParticipantProcessor;
-import com.jboss.transaction.txinterop.webservices.bainterop.generated.ParticipantPortType;
import com.jboss.transaction.txinterop.webservices.CoordinationContextManager;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
import org.jboss.wsf.common.addressing.MAP;
-import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
-import org.jboss.jbossts.xts.soapfault.Fault;
import com.arjuna.webservices11.SoapFault11;
import com.arjuna.wsc11.messaging.MessageId;
@@ -41,6 +38,7 @@
import javax.annotation.Resource;
import org.oasis_open.docs.ws_tx.wscoor._2006._06.CoordinationContextType;
+import org.xmlsoap.schemas.soap.envelope.Fault;
/**
* Implementation class for WSTX 1.1 AT Interop Test Initiator service
@@ -48,11 +46,12 @@
@WebService(name = "ParticipantPortType",
targetNamespace = "http://fabrikam123.com/wsba",
portName="ParticipantPortType",
- wsdlLocation="/WEB-INF/wsdl/interopba-participant-binding.wsdl",
+ // wsdlLocation="/WEB-INF/wsdl/interopba-participant-binding.wsdl",
serviceName="ParticipantService")
@Addressing(required=true)
@HandlerChain(file="participanthandlers.xml")
-public class ParticipantPortTypeImpl implements ParticipantPortType, SoapFaultPortType {
+public class ParticipantPortTypeImpl // implements ParticipantPortType, SoapFaultPortType
+{
/**
* injected resource providing access to WSA addressing properties
Copied: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/soapfault/client/SoapFaultClient.java (from rev 33730, labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/client/SoapFaultClient.java)
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/soapfault/client/SoapFaultClient.java (rev 0)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/soapfault/client/SoapFaultClient.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -0,0 +1,131 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a full listing
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.jboss.transaction.txinterop.webservices.soapfault.client;
+
+import com.arjuna.webservices11.SoapFault11;
+import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
+import org.jboss.jbossts.xts.soapfault.SoapFaultService;
+import org.jboss.wsf.common.addressing.MAP;
+import org.xmlsoap.schemas.soap.envelope.Fault;
+
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.soap.AddressingFeature;
+import javax.xml.ws.wsaddressing.W3CEndpointReference;
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * Base client.
+ * @author kevin
+ */
+public class SoapFaultClient
+{
+ /**
+ * Send a fault.
+ * @param soapFault The SOAP fault.
+ * @param map addressing context initialised with to and message ID.
+ * @param action The action URI for the request.
+ * @throws com.arjuna.webservices.SoapFault For any errors.
+ * @throws java.io.IOException for any transport errors.
+ */
+ public static void sendSoapFault(final SoapFault11 soapFault,
+ final MAP map,
+ final String action)
+ throws SoapFault11, IOException
+ {
+ if (action != null)
+ {
+ soapFault.setAction(action) ;
+ }
+
+ final org.jboss.jbossts.xts.soapfault.SoapFaultPortType faultPort = getSoapFaultPort(map, action);
+ Fault fault = soapFault.toFault();
+ faultPort.soapFault(fault);
+ }
+
+ /**
+ * fetch a coordinator activation service unique to the current thread
+ * @return
+ */
+ private static synchronized SoapFaultService getSoapFaultService()
+ {
+ if (soapFaultService.get() == null) {
+ // we don't supply wsdl on the client side -- we want this client to address the various
+ // different versions of the service which bind the fault WebMethod using different
+ // soap actions. the annotations on the service and port supply all the info needed
+ // to create the service and port on the client side.
+ // soapFaultService.set(new SoapFaultService(null, new QName("http://jbossts.jboss.org/xts/soapfault", "SoapFaultService")));
+ soapFaultService.set(new SoapFaultService());
+ }
+ return soapFaultService.get();
+ }
+
+ private static org.jboss.jbossts.xts.soapfault.SoapFaultPortType getSoapFaultPort(final MAP map,
+ final String action)
+ {
+ SoapFaultService service = getSoapFaultService();
+ SoapFaultPortType port = service.getPort(org.jboss.jbossts.xts.soapfault.SoapFaultPortType.class, new AddressingFeature(true, true));
+ BindingProvider bindingProvider = (BindingProvider)port;
+ String to = map.getTo();
+ /*
+ * we no longer have to add the JaxWS WSAddressingClientHandler because we can specify the WSAddressing feature
+ List<Handler> customHandlerChain = new ArrayList<Handler>();
+ customHandlerChain.add(new WSAddressingClientHandler());
+ bindingProvider.getBinding().setHandlerChain(customHandlerChain);
+ */
+
+ Map<String, Object> requestContext = bindingProvider.getRequestContext();
+ if (action != null) {
+ map.setAction(action);
+ }
+ AddressingHelper.configureRequestContext(requestContext, map, to, action);
+
+ return port;
+ }
+
+ private static org.jboss.jbossts.xts.soapfault.SoapFaultPortType getSoapFaultPort(final W3CEndpointReference endpoint,
+ final MAP map,
+ final String action)
+ {
+ SoapFaultService service = getSoapFaultService();
+ org.jboss.jbossts.xts.soapfault.SoapFaultPortType port = service.getPort(endpoint, org.jboss.jbossts.xts.soapfault.SoapFaultPortType.class, new AddressingFeature(true, true));
+ BindingProvider bindingProvider = (BindingProvider)port;
+ Map<String, Object> requestContext = bindingProvider.getRequestContext();
+ MAP requestMap = AddressingHelper.outboundMap(requestContext);
+ if (action != null) {
+ map.setAction(action);
+ }
+ AddressingHelper.installCallerProperties(map, requestMap);
+ String to = requestMap.getTo();
+ /*
+ * we no longer have to add the JaxWS WSAddressingClientHandler because we can specify the WSAddressing feature
+ List<Handler> customHandlerChain = new ArrayList<Handler>();
+ customHandlerChain.add(new WSAddressingClientHandler());
+ bindingProvider.getBinding().setHandlerChain(customHandlerChain);
+ */
+ AddressingHelper.configureRequestContext(requestContext, to, action);
+
+ return port;
+ }
+
+ private static final ThreadLocal<SoapFaultService> soapFaultService = new ThreadLocal<SoapFaultService>();
+}
\ No newline at end of file
Added: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/org/jboss/jbossts/xts/soapfault/SoapFaultPortType.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/org/jboss/jbossts/xts/soapfault/SoapFaultPortType.java (rev 0)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/org/jboss/jbossts/xts/soapfault/SoapFaultPortType.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -0,0 +1,35 @@
+
+package org.jboss.jbossts.xts.soapfault;
+
+import org.xmlsoap.schemas.soap.envelope.Fault;
+
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.bind.annotation.XmlSeeAlso;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.2-hudson-182-RC1
+ * Generated source version: 2.1
+ *
+ */
+ at WebService(name = "SoapFaultPortType", targetNamespace = "http://jbossts.jboss.org/xts/soapfault")
+ at SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+public interface SoapFaultPortType {
+
+
+ /**
+ *
+ * @param fault
+ */
+ @WebMethod(operationName = "SoapFault")
+ @Oneway
+ public void soapFault(
+ @WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "fault")
+ Fault fault);
+
+}
Added: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/org/jboss/jbossts/xts/soapfault/SoapFaultService.java
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/org/jboss/jbossts/xts/soapfault/SoapFaultService.java (rev 0)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/src/org/jboss/jbossts/xts/soapfault/SoapFaultService.java 2010-07-05 13:25:11 UTC (rev 33740)
@@ -0,0 +1,73 @@
+
+package org.jboss.jbossts.xts.soapfault;
+
+import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.logging.Logger;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+import javax.xml.ws.WebServiceFeature;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.2-hudson-182-RC1
+ * Generated source version: 2.1
+ *
+ */
+ at WebServiceClient(name = "SoapFaultService", targetNamespace = "http://jbossts.jboss.org/xts/soapfault", wsdlLocation = "wsdl/soapfault.wsdl")
+public class SoapFaultService
+ extends Service
+{
+
+ private final static URL SOAPFAULTSERVICE_WSDL_LOCATION;
+ private final static Logger logger = Logger.getLogger(org.jboss.jbossts.xts.soapfault.SoapFaultService.class.getName());
+
+ static {
+ URL url = null;
+ try {
+ URL baseUrl;
+ baseUrl = org.jboss.jbossts.xts.soapfault.SoapFaultService.class.getResource(".");
+ url = new URL(baseUrl, "wsdl/soapfault.wsdl");
+ } catch (MalformedURLException e) {
+ logger.warning("Failed to create URL for the wsdl Location: 'wsdl/soapfault.wsdl', retrying as a local file");
+ logger.warning(e.getMessage());
+ }
+ SOAPFAULTSERVICE_WSDL_LOCATION = url;
+ }
+
+ public SoapFaultService(URL wsdlLocation, QName serviceName) {
+ super(wsdlLocation, serviceName);
+ }
+
+ public SoapFaultService() {
+ super(SOAPFAULTSERVICE_WSDL_LOCATION, new QName("http://jbossts.jboss.org/xts/soapfault", "SoapFaultService"));
+ }
+
+ /**
+ *
+ * @return
+ * returns SoapFaultPortType
+ */
+ @WebEndpoint(name = "SoapFaultPortType")
+ public SoapFaultPortType getSoapFaultPortType() {
+ return super.getPort(new QName("http://jbossts.jboss.org/xts/soapfault", "SoapFaultPortType"), SoapFaultPortType.class);
+ }
+
+ /**
+ *
+ * @param features
+ * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
+ * @return
+ * returns SoapFaultPortType
+ */
+ @WebEndpoint(name = "SoapFaultPortType")
+ public org.jboss.jbossts.xts.soapfault.SoapFaultPortType getSoapFaultPortType(WebServiceFeature... features) {
+ return super.getPort(new QName("http://jbossts.jboss.org/xts/soapfault", "SoapFaultPortType"), SoapFaultPortType.class, features);
+ }
+
+}
More information about the jboss-svn-commits
mailing list