[jboss-svn-commits] JBL Code SVN: r33730 - in labs/jbosstm/trunk/XTS: WS-C/dev/src11/com/arjuna/webservices11/wsaddr/client and 19 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jul 2 07:23:51 EDT 2010
Author: adinn
Date: 2010-07-02 07:23:49 -0400 (Fri, 02 Jul 2010)
New Revision: 33730
Removed:
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/map/
Modified:
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/client/SoapFaultClient.java
labs/jbosstm/trunk/XTS/WS-T/build.xml
labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/build.sh
labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsat-completion-initiator-binding.wsdl
labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsat-coordinator-binding.wsdl
labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsat-participant-binding.wsdl
labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsat.wsdl
labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsba-coordinator-completion-coordinator-binding.wsdl
labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsba-coordinator-completion-participant-binding.wsdl
labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsba-participant-completion-coordinator-binding.wsdl
labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsba-participant-completion-participant-binding.wsdl
labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsba.wsdl
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationCoordinatorClient.java
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/TerminationParticipantPortTypeImpl.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/CoordinatorCompletionParticipantClient.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/com/arjuna/wst11/messaging/CoordinatorCompletionCoordinatorProcessorImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionParticipantProcessorImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionCoordinatorProcessorImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionParticipantProcessorImpl.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorCompletionCoordinatorEngine.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/BusinessActivityTerminatorStub.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/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionCoordinatorTestCase.java
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCParticipantTestCase.java
labs/jbosstm/trunk/XTS/sar/tests/dd/WEB-INF/web.xml
labs/jbosstm/trunk/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/service/XTSServiceTestPortTypeImpl.java
labs/jbosstm/trunk/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/service/subordinate/XTSSubordinateServiceTestPortTypeImpl.java
Log:
partially complete and working version for XTS which explicitly includes SoapFault delivery in the WSTX service WSDL. still need to remove reliance on soap fault service for delivery where there is no W3C endpoint -- part fix for JBTM-755
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/client/SoapFaultClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/client/SoapFaultClient.java 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/client/SoapFaultClient.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -65,31 +65,6 @@
}
/**
- * Send a fault to a specific endpoint.
- * @param soapFault The SOAP fault.
- * @param endpoint an endpoint ot dispatch the fault to.
- * @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,
- W3CEndpointReference endpoint,
- final MAP map,
- final String action)
- throws SoapFault11, IOException
- {
- if (action != null)
- {
- soapFault.setAction(action) ;
- }
-
- final SoapFaultPortType faultPort = getSoapFaultPort(endpoint, map, action);
- Fault fault = soapFault.toFault();
- faultPort.soapFault(fault);
- }
-
- /**
* fetch a coordinator activation service unique to the current thread
* @return
*/
Modified: labs/jbosstm/trunk/XTS/WS-T/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/build.xml 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/build.xml 2010-07-02 11:23:49 UTC (rev 33730)
@@ -214,26 +214,26 @@
<target name="wsdl11">
<!-- wsdl files for services -->
- <copy file="${dd.dir}/wscoor1.1/wsdl/wsat.wsdl" tofile="${build.dd.dir}/wsdl/wsat.wsdl"/>
- <copy file="${dd.dir}/wscoor1.1/wsdl/wsat.xsd" tofile="${build.dd.dir}/wsdl/wsat.xsd"/>
- <copy file="${dd.dir}/wscoor1.1/wsdl/ws-addr.xsd" tofile="${build.dd.dir}/wsdl/ws-addr.xsd"/>
+ <!--<copy file="${dd.dir}/wscoor1.1/wsdl/wsat.wsdl" tofile="${build.dd.dir}/wsdl/wsat.wsdl"/>-->
+ <!--<copy file="${dd.dir}/wscoor1.1/wsdl/wsat.xsd" tofile="${build.dd.dir}/wsdl/wsat.xsd"/>-->
+ <!--<copy file="${dd.dir}/wscoor1.1/wsdl/ws-addr.xsd" tofile="${build.dd.dir}/wsdl/ws-addr.xsd"/>-->
- <copy file="${dd.dir}/wscoor1.1/wsdl/wsat-participant-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsat-participant-binding.wsdl"/>
- <copy file="${dd.dir}/wscoor1.1/wsdl/wsat-coordinator-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsat-coordinator-binding.wsdl"/>
- <copy file="${dd.dir}/wscoor1.1/wsdl/wsat-completion-initiator-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsat-completion-initiator-binding.wsdl"/>
- <copy file="${dd.dir}/wscoor1.1/wsdl/wsat-completion-coordinator-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsat-completion-coordinator-binding.wsdl"/>
+ <!--<copy file="${dd.dir}/wscoor1.1/wsdl/wsat-participant-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsat-participant-binding.wsdl"/>-->
+ <!--<copy file="${dd.dir}/wscoor1.1/wsdl/wsat-coordinator-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsat-coordinator-binding.wsdl"/>-->
+ <!--<copy file="${dd.dir}/wscoor1.1/wsdl/wsat-completion-initiator-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsat-completion-initiator-binding.wsdl"/>-->
+ <!--<copy file="${dd.dir}/wscoor1.1/wsdl/wsat-completion-coordinator-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsat-completion-coordinator-binding.wsdl"/>-->
- <copy file="${dd.dir}/wscoor1.1/wsdl/wsba.wsdl" tofile="${build.dd.dir}/wsdl/wsba.wsdl"/>
- <copy file="${dd.dir}/wscoor1.1/wsdl/wsba.xsd" tofile="${build.dd.dir}/wsdl/wsba.xsd"/>
+ <!--<copy file="${dd.dir}/wscoor1.1/wsdl/wsba.wsdl" tofile="${build.dd.dir}/wsdl/wsba.wsdl"/>-->
+ <!--<copy file="${dd.dir}/wscoor1.1/wsdl/wsba.xsd" tofile="${build.dd.dir}/wsdl/wsba.xsd"/>-->
- <copy file="${dd.dir}/wscoor1.1/wsdl/wsba-coordinator-completion-coordinator-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsba-coordinator-completion-coordinator-binding.wsdl"/>
- <copy file="${dd.dir}/wscoor1.1/wsdl/wsba-coordinator-completion-participant-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsba-coordinator-completion-participant-binding.wsdl"/>
- <copy file="${dd.dir}/wscoor1.1/wsdl/wsba-participant-completion-coordinator-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsba-participant-completion-coordinator-binding.wsdl"/>
- <copy file="${dd.dir}/wscoor1.1/wsdl/wsba-participant-completion-participant-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsba-participant-completion-participant-binding.wsdl"/>
+ <!--<copy file="${dd.dir}/wscoor1.1/wsdl/wsba-coordinator-completion-coordinator-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsba-coordinator-completion-coordinator-binding.wsdl"/>-->
+ <!--<copy file="${dd.dir}/wscoor1.1/wsdl/wsba-coordinator-completion-participant-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsba-coordinator-completion-participant-binding.wsdl"/>-->
+ <!--<copy file="${dd.dir}/wscoor1.1/wsdl/wsba-participant-completion-coordinator-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsba-participant-completion-coordinator-binding.wsdl"/>-->
+ <!--<copy file="${dd.dir}/wscoor1.1/wsdl/wsba-participant-completion-participant-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsba-participant-completion-participant-binding.wsdl"/>-->
- <copy file="${dd.dir}/wsarjtx/wsdl/wsarjtx.wsdl" tofile="${build.dd.dir}/wsdl/wsarjtx.wsdl"/>
- <copy file="${dd.dir}/wsarjtx/wsdl/wsarjtx-termination-coordinator-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsarjtx-termination-coordinator-binding.wsdl"/>
- <copy file="${dd.dir}/wsarjtx/wsdl/wsarjtx-termination-participant-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsarjtx-termination-participant-binding.wsdl"/>
+ <!--<copy file="${dd.dir}/wsarjtx/wsdl/wsarjtx.wsdl" tofile="${build.dd.dir}/wsdl/wsarjtx.wsdl"/>-->
+ <!--<copy file="${dd.dir}/wsarjtx/wsdl/wsarjtx-termination-coordinator-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsarjtx-termination-coordinator-binding.wsdl"/>-->
+ <!--<copy file="${dd.dir}/wsarjtx/wsdl/wsarjtx-termination-participant-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsarjtx-termination-participant-binding.wsdl"/>-->
<!-- wsdl files for clients -->
<mkdir dir="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsat/_2006/_06/wsdl"/>
@@ -242,6 +242,7 @@
<copy file="${dd.dir}/wscoor1.1/wsdl/wsat.wsdl" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsat/_2006/_06/wsdl/wsat.wsdl"/>
<copy file="${dd.dir}/wscoor1.1/wsdl/wsat.xsd" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsat/_2006/_06/wsdl/wsat.xsd"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/envelope.xsd" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsat/_2006/_06/wsdl/envelope.xsd"/>
<copy file="${dd.dir}/wscoor1.1/wsdl/ws-addr.xsd" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsat/_2006/_06/wsdl/ws-addr.xsd"/>
<copy file="${dd.dir}/wscoor1.1/wsdl/wsat-participant-binding.wsdl" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsat/_2006/_06/wsdl/wsat-participant-binding.wsdl"/>
@@ -251,6 +252,7 @@
<copy file="${dd.dir}/wscoor1.1/wsdl/wsba.wsdl" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsba/_2006/_06/wsdl/wsba.wsdl"/>
<copy file="${dd.dir}/wscoor1.1/wsdl/wsba.xsd" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsba/_2006/_06/wsdl/wsba.xsd"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/envelope.xsd" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsba/_2006/_06/wsdl/envelope.xsd"/>
<copy file="${dd.dir}/wscoor1.1/wsdl/ws-addr.xsd" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsba/_2006/_06/wsdl/ws-addr.xsd"/>
<copy file="${dd.dir}/wscoor1.1/wsdl/wsba-coordinator-completion-coordinator-binding.wsdl" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsba/_2006/_06/wsdl/wsba-coordinator-completion-coordinator-binding.wsdl"/>
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/build.sh
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/build.sh 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/build.sh 2010-07-02 11:23:49 UTC (rev 33730)
@@ -18,33 +18,45 @@
rm -rf tmp/classes/* tmp/src/*
-# $JBOSS_HOME/bin/wsconsume.sh -v -k -w /wsdl/wsat.wsdl -o tmp/classes -s tmp/src -k wsdl/wsat-binding.wsdl
+# first the at services
-# $JBOSS_HOME/bin/wsconsume.sh -v -k -w /wsdl/wsba.wsdl -o tmp/classes -s tmp/src -k wsdl/wsba-binding.wsdl
+#$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsat-completion-coordinator-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsat-completion-coordinator-binding.wsdl
-# $JBOSS_HOME/bin/wsconsume.sh -v -k -w /home/adinn/tmp/wsdl/wsat.wsdl -o tmp/classes -s tmp/src -k wsdl/wsat-binding.wsdl
+#$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsat-completion-initiator-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsat-completion-initiator-binding.wsdl
-# $JBOSS_HOME/bin/wsconsume.sh -v -k -w /home/adinn/tmp/wsdl/wsba.wsdl -o tmp/classes -s tmp/src -k wsdl/wsba-binding.wsdl
+#$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsat-coordinator-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsat-coordinator-binding.wsdl
+#$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsat-participant-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsat-participant-binding.wsdl
+
+# now the ba services
+
+#$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsba-coordinator-completion-coordinator-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsba-coordinator-completion-coordinator-binding.wsdl
+
+#$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsba-coordinator-completion-participant-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsba-coordinator-completion-participant-binding.wsdl
+
+#$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsba-participant-completion-coordinator-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsba-participant-completion-coordinator-binding.wsdl
+
+#$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsba-participant-completion-participant-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsba-participant-completion-participant-binding.wsdl
+
# first the at services
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsat-completion-coordinator-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsat-completion-coordinator-binding.wsdl
+$JBOSS_HOME/bin/wsconsume.sh -v -k -w wsdl/wsat-completion-coordinator-binding.wsdl -o tmp/classes -s tmp/src wsdl/wsat-completion-coordinator-binding.wsdl
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsat-completion-initiator-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsat-completion-initiator-binding.wsdl
+$JBOSS_HOME/bin/wsconsume.sh -v -k -w wsdl/wsat-completion-initiator-binding.wsdl -o tmp/classes -s tmp/src wsdl/wsat-completion-initiator-binding.wsdl
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsat-coordinator-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsat-coordinator-binding.wsdl
+$JBOSS_HOME/bin/wsconsume.sh -v -k -w wsdl/wsat-coordinator-binding.wsdl -o tmp/classes -s tmp/src wsdl/wsat-coordinator-binding.wsdl
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsat-participant-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsat-participant-binding.wsdl
+$JBOSS_HOME/bin/wsconsume.sh -v -k -w wsdl/wsat-participant-binding.wsdl -o tmp/classes -s tmp/src wsdl/wsat-participant-binding.wsdl
# now the ba services
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsba-coordinator-completion-coordinator-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsba-coordinator-completion-coordinator-binding.wsdl
+$JBOSS_HOME/bin/wsconsume.sh -v -k -w wsdl/wsba-coordinator-completion-coordinator-binding.wsdl -o tmp/classes -s tmp/src wsdl/wsba-coordinator-completion-coordinator-binding.wsdl
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsba-coordinator-completion-participant-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsba-coordinator-completion-participant-binding.wsdl
+$JBOSS_HOME/bin/wsconsume.sh -v -k -w wsdl/wsba-coordinator-completion-participant-binding.wsdl -o tmp/classes -s tmp/src wsdl/wsba-coordinator-completion-participant-binding.wsdl
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsba-participant-completion-coordinator-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsba-participant-completion-coordinator-binding.wsdl
+$JBOSS_HOME/bin/wsconsume.sh -v -k -w wsdl/wsba-participant-completion-coordinator-binding.wsdl -o tmp/classes -s tmp/src wsdl/wsba-participant-completion-coordinator-binding.wsdl
-$GF_HOME/bin/wsimport -verbose -keep -wsdllocation wsdl/wsba-participant-completion-participant-binding.wsdl -d tmp/classes -s tmp/src -target 2.1 wsdl/wsba-participant-completion-participant-binding.wsdl
+$JBOSS_HOME/bin/wsconsume.sh -v -k -w wsdl/wsba-participant-completion-participant-binding.wsdl -o tmp/classes -s tmp/src wsdl/wsba-participant-completion-participant-binding.wsdl
# we need to patch the resource lookup used to provide a jar base URL
# for the wsdl location supplied above wsimport generates
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsat-completion-initiator-binding.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsat-completion-initiator-binding.wsdl 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsat-completion-initiator-binding.wsdl 2010-07-02 11:23:49 UTC (rev 33730)
@@ -27,6 +27,13 @@
<soap:body use="literal"/>
</wsdl:input>
</wsdl:operation>
+
+ <wsdl:operation name="SoapFault">
+ <soap:operation soapAction="http://docs.oasis-open.org/ws-tx/wsat/2006/06/fault"/>
+ <wsdl:input message="wsat:SoapFault">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ </wsdl:operation>
</wsdl:binding>
<wsdl:service name="CompletionInitiatorService">
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsat-coordinator-binding.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsat-coordinator-binding.wsdl 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsat-coordinator-binding.wsdl 2010-07-02 11:23:49 UTC (rev 33730)
@@ -40,6 +40,13 @@
<soap:body use="literal"/>
</wsdl:input>
</wsdl:operation>
+
+ <wsdl:operation name="SoapFault">
+ <soap:operation soapAction="http://docs.oasis-open.org/ws-tx/wsat/2006/06/fault"/>
+ <wsdl:input message="wsat:SoapFault">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ </wsdl:operation>
</wsdl:binding>
<wsdl:service name="CoordinatorService">
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsat-participant-binding.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsat-participant-binding.wsdl 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsat-participant-binding.wsdl 2010-07-02 11:23:49 UTC (rev 33730)
@@ -33,6 +33,13 @@
<soap:body use="literal"/>
</wsdl:input>
</wsdl:operation>
+
+ <wsdl:operation name="SoapFault">
+ <soap:operation soapAction="http://docs.oasis-open.org/ws-tx/wsat/2006/06/fault"/>
+ <wsdl:input message="wsat:SoapFault">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ </wsdl:operation>
</wsdl:binding>
<wsdl:service name="ParticipantService">
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsat.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsat.wsdl 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsat.wsdl 2010-07-02 11:23:49 UTC (rev 33730)
@@ -12,6 +12,7 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:wsat="http://docs.oasis-open.org/ws-tx/wsat/2006/06"
xmlns:wsa="http://www.w3.org/2005/08/addressing"
+ xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
targetNamespace="http://docs.oasis-open.org/ws-tx/wsat/2006/06"
>
<wsdl:types>
@@ -22,6 +23,8 @@
<xs:import
namespace="http://docs.oasis-open.org/ws-tx/wsat/2006/06"
schemaLocation="wsat.xsd" />
+ <xs:import namespace="http://schemas.xmlsoap.org/soap/envelope/"
+ schemaLocation="envelope.xsd"/>
</xs:schema>
</wsdl:types>
<!-- Messages -->
@@ -46,6 +49,9 @@
<wsdl:message name="Committed">
<wsdl:part name="parameters" element="wsat:Committed"/>
</wsdl:message>
+ <wsdl:message name="SoapFault">
+ <wsdl:part name="parameters" element="soapenv:Fault"/>
+ </wsdl:message>
<!-- Port Types -->
<wsdl:portType name="CompletionCoordinatorPortType">
<wsdl:operation name="CommitOperation">
@@ -62,6 +68,9 @@
<wsdl:operation name="AbortedOperation">
<wsdl:input message="wsat:Aborted"/>
</wsdl:operation>
+ <wsdl:operation name="SoapFault">
+ <wsdl:input message="wsat:SoapFault"/>
+ </wsdl:operation>
</wsdl:portType>
<wsdl:portType name="CoordinatorPortType">
<wsdl:operation name="PreparedOperation">
@@ -76,6 +85,9 @@
<wsdl:operation name="CommittedOperation">
<wsdl:input message="wsat:Committed"/>
</wsdl:operation>
+ <wsdl:operation name="SoapFault">
+ <wsdl:input message="wsat:SoapFault"/>
+ </wsdl:operation>
</wsdl:portType>
<wsdl:portType name="ParticipantPortType">
<wsdl:operation name="PrepareOperation">
@@ -87,5 +99,8 @@
<wsdl:operation name="RollbackOperation">
<wsdl:input message="wsat:Rollback"/>
</wsdl:operation>
+ <wsdl:operation name="SoapFault">
+ <wsdl:input message="wsat:SoapFault"/>
+ </wsdl:operation>
</wsdl:portType>
</wsdl:definitions>
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsba-coordinator-completion-coordinator-binding.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsba-coordinator-completion-coordinator-binding.wsdl 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsba-coordinator-completion-coordinator-binding.wsdl 2010-07-02 11:23:49 UTC (rev 33730)
@@ -69,6 +69,13 @@
<soap:body use="literal"/>
</wsdl:input>
</wsdl:operation>
+
+ <wsdl:operation name="SoapFault">
+ <soap:operation soapAction="http://docs.oasis-open.org/ws-tx/wscoor/2006/06/fault"/>
+ <wsdl:input message="wsba:SoapFault">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ </wsdl:operation>
</wsdl:binding>
<wsdl:service name="BusinessAgreementWithCoordinatorCompletionCoordinatorService">
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsba-coordinator-completion-participant-binding.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsba-coordinator-completion-participant-binding.wsdl 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsba-coordinator-completion-participant-binding.wsdl 2010-07-02 11:23:49 UTC (rev 33730)
@@ -69,6 +69,13 @@
<soap:body use="literal"/>
</wsdl:input>
</wsdl:operation>
+
+ <wsdl:operation name="SoapFault">
+ <soap:operation soapAction="http://docs.oasis-open.org/ws-tx/wscoor/2006/06/fault"/>
+ <wsdl:input message="wsba:SoapFault">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ </wsdl:operation>
</wsdl:binding>
<wsdl:service name="BusinessAgreementWithCoordinatorCompletionParticipantService">
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsba-participant-completion-coordinator-binding.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsba-participant-completion-coordinator-binding.wsdl 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsba-participant-completion-coordinator-binding.wsdl 2010-07-02 11:23:49 UTC (rev 33730)
@@ -69,6 +69,13 @@
<soap:body use="literal"/>
</wsdl:input>
</wsdl:operation>
+
+ <wsdl:operation name="SoapFault">
+ <soap:operation soapAction="http://docs.oasis-open.org/ws-tx/wscoor/2006/06/fault"/>
+ <wsdl:input message="wsba:SoapFault">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ </wsdl:operation>
</wsdl:binding>
<wsdl:service name="BusinessAgreementWithParticipantCompletionCoordinatorService">
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsba-participant-completion-participant-binding.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsba-participant-completion-participant-binding.wsdl 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsba-participant-completion-participant-binding.wsdl 2010-07-02 11:23:49 UTC (rev 33730)
@@ -62,6 +62,13 @@
<soap:body use="literal"/>
</wsdl:input>
</wsdl:operation>
+
+ <wsdl:operation name="SoapFault">
+ <soap:operation soapAction="http://docs.oasis-open.org/ws-tx/wscoor/2006/06/fault"/>
+ <wsdl:input message="wsba:SoapFault">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ </wsdl:operation>
</wsdl:binding>
<wsdl:service name="BusinessAgreementWithParticipantCompletionParticipantService">
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsba.wsdl
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsba.wsdl 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/dd/wscoor1.1/wsdl/wsba.wsdl 2010-07-02 11:23:49 UTC (rev 33730)
@@ -1,9 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright OASIS Open 2006. All Rights Reserved. -->
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsba="http://docs.oasis-open.org/ws-tx/wsba/2006/06" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://docs.oasis-open.org/ws-tx/wsba/2006/06">
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsba="http://docs.oasis-open.org/ws-tx/wsba/2006/06"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+ targetNamespace="http://docs.oasis-open.org/ws-tx/wsba/2006/06">
<wsdl:types>
<xs:schema>
<xs:import namespace="http://docs.oasis-open.org/ws-tx/wsba/2006/06" schemaLocation="wsba.xsd"/>
+ <xs:import namespace="http://schemas.xmlsoap.org/soap/envelope/"
+ schemaLocation="envelope.xsd"/>
</xs:schema>
</wsdl:types>
<!-- Messages -->
@@ -55,6 +61,9 @@
<wsdl:message name="Status">
<wsdl:part name="parameters" element="wsba:Status"/>
</wsdl:message>
+ <wsdl:message name="SoapFault">
+ <wsdl:part name="parameters" element="soapenv:Fault"/>
+ </wsdl:message>
<!-- BusinessAgreement Service -->
<wsdl:portType name="BusinessAgreementWithParticipantCompletionCoordinatorPortType">
<wsdl:operation name="CompletedOperation">
@@ -84,6 +93,9 @@
<wsdl:operation name="StatusOperation">
<wsdl:input message="wsba:Status"/>
</wsdl:operation>
+ <wsdl:operation name="SoapFault">
+ <wsdl:input message="wsba:SoapFault"/>
+ </wsdl:operation>
</wsdl:portType>
<wsdl:portType name="BusinessAgreementWithParticipantCompletionParticipantPortType">
<wsdl:operation name="CloseOperation">
@@ -110,6 +122,9 @@
<wsdl:operation name="StatusOperation">
<wsdl:input message="wsba:Status"/>
</wsdl:operation>
+ <wsdl:operation name="SoapFault">
+ <wsdl:input message="wsba:SoapFault"/>
+ </wsdl:operation>
</wsdl:portType>
<!-- BusinessAgreementWithComplete Service -->
<wsdl:portType name="BusinessAgreementWithCoordinatorCompletionCoordinatorPortType">
@@ -140,6 +155,9 @@
<wsdl:operation name="StatusOperation">
<wsdl:input message="wsba:Status"/>
</wsdl:operation>
+ <wsdl:operation name="SoapFault">
+ <wsdl:input message="wsba:SoapFault"/>
+ </wsdl:operation>
</wsdl:portType>
<wsdl:portType name="BusinessAgreementWithCoordinatorCompletionParticipantPortType">
<wsdl:operation name="CompleteOperation">
@@ -169,5 +187,8 @@
<wsdl:operation name="StatusOperation">
<wsdl:input message="wsba:Status"/>
</wsdl:operation>
+ <wsdl:operation name="SoapFault">
+ <wsdl:input message="wsba:SoapFault"/>
+ </wsdl:operation>
</wsdl:portType>
</wsdl:definitions>
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationCoordinatorClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationCoordinatorClient.java 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/client/TerminationCoordinatorClient.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -154,25 +154,6 @@
}
/**
- * Send a fault.
- * @param map addressing context initialised with to and message ID.
- * @param soapFault The SOAP fault.
- * @param identifier The arjuna instance identifier.
- * @throws SoapFault For any errors.
- * @throws IOException for any transport errors.
- */
- public void sendSoapFault(final W3CEndpointReference endpoint,
- final MAP map,
- final SoapFault soapFault,
- final InstanceIdentifier identifier)
- throws SoapFault, IOException
- {
- AddressingHelper.installNoneReplyTo(map);
- // use the SoapFaultService to format a soap fault and send it back to the faultto or from address
- SoapFaultClient.sendSoapFault((SoapFault11)soapFault, endpoint, map, faultAction);
- }
-
- /**
* return a participant endpoint appropriate to the type of coordinator
* @param coordinator
* @return either the secure terminaton coordinator endpoint or the non-secure endpoint
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-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationCoordinatorPortTypeImpl.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -30,7 +30,7 @@
*
*/
@WebService(name = "TerminationCoordinatorPortType", targetNamespace = "http://schemas.arjuna.com/ws/2005/10/wsarjtx",
- wsdlLocation = "/WEB-INF/wsdl/wsarjtx-termination-coordinator-binding.wsdl",
+ // wsdlLocation = "/WEB-INF/wsdl/wsarjtx-termination-coordinator-binding.wsdl",
serviceName = "TerminationCoordinatorService",
portName = "TerminationCoordinatorPortType"
)
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationParticipantPortTypeImpl.java 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/sei/TerminationParticipantPortTypeImpl.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -32,7 +32,7 @@
*
*/
@WebService(name = "TerminationParticipantPortType", targetNamespace = "http://schemas.arjuna.com/ws/2005/10/wsarjtx",
- wsdlLocation = "/WEB-INF/wsdl/wsarjtx-termination-participant-binding.wsdl",
+ // wsdlLocation = "/WEB-INF/wsdl/wsarjtx-termination-participant-binding.wsdl",
serviceName = "TerminationParticipantService",
portName = "TerminationParticipantPortType"
)
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-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionInitiatorClient.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -5,10 +5,10 @@
import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.SoapFault11;
-import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
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;
@@ -118,9 +118,11 @@
public void sendSoapFault(final W3CEndpointReference participant, final MAP map, final SoapFault soapFault, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installNoneReplyTo(map);
- // use the SoapFaultService to format a soap fault and send it back to the faultto or from address
- SoapFaultClient.sendSoapFault((SoapFault11)soapFault, participant, map, faultAction);
+ CompletionInitiatorPortType port = getPort(participant, map, faultAction);
+ // convert fault to the wire format and dispatch it to the initiator
+ soapFault.setAction(faultAction) ;
+ Fault fault = ((SoapFault11)soapFault).toFault();
+ port.soapFault(fault);
}
/**
@@ -134,9 +136,11 @@
public void sendSoapFault(final MAP map, final SoapFault soapFault, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installNoneReplyTo(map);
- // use the SoapFaultService to format a soap fault and send it back to the faultto or from address
- SoapFaultClient.sendSoapFault((SoapFault11)soapFault, map, faultAction);
+ CompletionInitiatorPortType port = getPort(null, map, faultAction);
+ // convert fault to the wire format and dispatch it to the initiator
+ soapFault.setAction(faultAction) ;
+ Fault fault = ((SoapFault11)soapFault).toFault();
+ port.soapFault(fault);
}
/**
@@ -177,6 +181,10 @@
final String action)
{
AddressingHelper.installNoneReplyTo(map);
- return WSATClient.getCompletionInitiatorPort(participant, action, map);
+ if (participant == null) {
+ return WSATClient.getCompletionInitiatorPort(action, map);
+ } else {
+ return WSATClient.getCompletionInitiatorPort(participant, action, map);
+ }
}
}
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-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CoordinatorClient.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -9,6 +9,7 @@
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;
@@ -164,9 +165,11 @@
public void sendSoapFault(final W3CEndpointReference endpoint, final MAP map, final SoapFault soapFault, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installNoneReplyTo(map);
- // use the SoapFaultService to format a soap fault and send it back to the faultto address
- SoapFaultClient.sendSoapFault((SoapFault11)soapFault, endpoint, map, faultAction);
+ CoordinatorPortType port = getPort(endpoint, map, faultAction);
+ // convert fault to the wire format and dispatch it to the initiator
+ soapFault.setAction(faultAction) ;
+ Fault fault = ((SoapFault11)soapFault).toFault();
+ port.soapFault(fault);
}
/**
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-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/ParticipantClient.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -5,10 +5,10 @@
import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.webservices11.SoapFault11;
-import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
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;
@@ -138,9 +138,11 @@
public void sendSoapFault(final MAP map, final SoapFault soapFault, final InstanceIdentifier identifier)
throws SoapFault, IOException
{
- AddressingHelper.installNoneReplyTo(map);
- // use the SoapFaultService to format a soap fault and send it back to the faultto or from address
- SoapFaultClient.sendSoapFault((SoapFault11)soapFault, map, faultAction);
+ ParticipantPortType port = getPort(null, map, faultAction);
+ // convert fault to the wire format and dispatch it to the initiator
+ soapFault.setAction(faultAction) ;
+ Fault fault = ((SoapFault11)soapFault).toFault();
+ port.soapFault(fault);
}
/**
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-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CompletionInitiatorPortTypeImpl.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -90,7 +90,7 @@
@WebMethod(operationName = "SoapFault", action = "http://docs.oasis-open.org/ws-tx/wsat/2006/06/fault")
@Oneway
@Action(input="http://docs.oasis-open.org/ws-tx/wsat/2006/06/fault")
- public void fault(
+ public void soapFault(
@WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "parameters")
Fault fault)
{
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-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/CoordinatorPortTypeImpl.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -136,7 +136,7 @@
@WebMethod(operationName = "SoapFault", action = "http://docs.oasis-open.org/ws-tx/wsat/2006/06/fault")
@Oneway
@Action(input="http://docs.oasis-open.org/ws-tx/wsat/2006/06/fault")
- public void fault(
+ public void soapFault(
@WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "parameters")
Fault fault)
{
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-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/sei/ParticipantPortTypeImpl.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -113,7 +113,7 @@
@WebMethod(operationName = "SoapFault", action = "http://docs.oasis-open.org/ws-tx/wsat/2006/06/fault")
@Oneway
@Action(input="http://docs.oasis-open.org/ws-tx/wsat/2006/06/fault")
- public void fault(
+ public void soapFault(
@WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "parameters")
Fault fault)
{
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-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/client/CoordinatorCompletionParticipantClient.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -20,6 +20,7 @@
*/
package com.arjuna.webservices11.wsba.client;
+import com.arjuna.webservices11.SoapFault11;
import com.arjuna.webservices11.wsba.BusinessActivityConstants;
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices11.wsba.client.WSBAClient;
@@ -28,6 +29,7 @@
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;
@@ -296,6 +298,23 @@
}
/**
+ * send a soap fault
+ * @param soapFault the fault to be sent
+ * @param participant the endpoint to send the fault to
+ * @param map addressing context to be used to send the fault
+ * @param faultAction the action to associate with the message
+ */
+ public void sendSoapFault(SoapFault11 soapFault, W3CEndpointReference participant, MAP map, String faultAction)
+ throws SoapFault, IOException
+ {
+ AddressingHelper.installNoneReplyTo(map);
+ map.setAction(faultAction);
+ BusinessAgreementWithCoordinatorCompletionParticipantPortType port;
+ port = getPort(participant, map, faultAction);
+ Fault fault = ((SoapFault11)soapFault).toFault();
+ port.soapFault(fault);
+ }
+ /**
* return a coordinator endpoint appropriate to the type of participant
* @param endpoint
* @return either the secure coordinator endpoint or the non-secure endpoint
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-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionCoordinatorPortTypeImpl.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -253,7 +253,7 @@
@WebMethod(operationName = "fault", action = "http://docs.oasis-open.org/ws-tx/wscoor/2006/06/fault")
@Oneway
@Action(input="http://docs.oasis-open.org/ws-tx/wscoor/2006/06/fault")
- public void fault(
+ public void soapFault(
@WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "parameters")
Fault fault)
{
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-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -37,7 +37,7 @@
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
@HandlerChain(file="/handlers.xml")
@Addressing(required=true)
-public class BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl // implements BusinessAgreementWithCoordinatorCompletionParticipantPortType
+public class BusinessAgreementWithCoordinatorCompletionParticipantPortTypeImpl implements BusinessAgreementWithCoordinatorCompletionParticipantPortType
{
@Resource
private WebServiceContext webServiceCtx;
@@ -252,7 +252,7 @@
@WebMethod(operationName = "fault", action = "http://docs.oasis-open.org/ws-tx/wscoor/2006/06/fault")
@Oneway
@Action(input="http://docs.oasis-open.org/ws-tx/wscoor/2006/06/fault")
- public void fault(
+ public void soapFault(
@WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "parameters")
Fault fault)
{
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-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionCoordinatorPortTypeImpl.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -252,7 +252,7 @@
@WebMethod(operationName = "fault", action = "http://docs.oasis-open.org/ws-tx/wscoor/2006/06/fault")
@Oneway
@Action(input="http://docs.oasis-open.org/ws-tx/wscoor/2006/06/fault")
- public void fault(
+ public void soapFault(
@WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "parameters")
Fault fault)
{
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-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/sei/BusinessAgreementWithParticipantCompletionParticipantPortTypeImpl.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -228,7 +228,7 @@
@WebMethod(operationName = "fault", action = "http://docs.oasis-open.org/ws-tx/wscoor/2006/06/fault")
@Oneway
@Action(input="http://docs.oasis-open.org/ws-tx/wscoor/2006/06/fault")
- public void fault(
+ public void soapFault(
@WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "parameters")
Fault fault)
{
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionCoordinatorProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionCoordinatorProcessorImpl.java 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionCoordinatorProcessorImpl.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -25,8 +25,8 @@
import com.arjuna.webservices.base.processors.ActivatedObjectProcessor;
import com.arjuna.webservices.logging.WSTLogger;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
import org.jboss.wsf.common.addressing.MAP;
-import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsba.CoordinatorCompletionCoordinatorInboundEvents;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionParticipantProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionParticipantProcessorImpl.java 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/CoordinatorCompletionParticipantProcessorImpl.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -25,8 +25,8 @@
import com.arjuna.webservices.base.processors.ActivatedObjectProcessor;
import com.arjuna.webservices.logging.WSTLogger;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
import org.jboss.wsf.common.addressing.MAP;
-import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsba.CoordinatorCompletionParticipantInboundEvents;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionCoordinatorProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionCoordinatorProcessorImpl.java 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionCoordinatorProcessorImpl.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -25,8 +25,8 @@
import com.arjuna.webservices.base.processors.ActivatedObjectProcessor;
import com.arjuna.webservices.logging.WSTLogger;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
import org.jboss.wsf.common.addressing.MAP;
-import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsba.ParticipantCompletionCoordinatorInboundEvents;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionParticipantProcessorImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionParticipantProcessorImpl.java 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/ParticipantCompletionParticipantProcessorImpl.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -25,8 +25,8 @@
import com.arjuna.webservices.base.processors.ActivatedObjectProcessor;
import com.arjuna.webservices.logging.WSTLogger;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
+import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
import org.jboss.wsf.common.addressing.MAP;
-import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsba.ParticipantCompletionParticipantInboundEvents;
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorCompletionCoordinatorEngine.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorCompletionCoordinatorEngine.java 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/CoordinatorCompletionCoordinatorEngine.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -25,8 +25,8 @@
import com.arjuna.webservices.logging.WSTLogger;
import com.arjuna.webservices.util.TransportTimer;
import com.arjuna.webservices11.wsaddr.AddressingHelper;
-import org.jboss.wsf.common.addressing.MAP;
import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
+import org.jboss.wsf.common.addressing.MAP;
import com.arjuna.webservices11.wsarj.ArjunaContext;
import com.arjuna.webservices11.wsarj.InstanceIdentifier;
import com.arjuna.webservices11.wsba.CoordinatorCompletionCoordinatorInboundEvents;
@@ -897,8 +897,7 @@
{
final SoapFault11 soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, CoordinationConstants.WSCOOR_ERROR_CODE_INVALID_STATE_QNAME,
WSTLogger.i18NLogger.get_wst11_messaging_engines_CoordinatorCompletionCoordinatorEngine_sendInvalidStateFault_2()) ;
- AddressingHelper.installNoneReplyTo(map);
- SoapFaultClient.sendSoapFault(soapFault, participant, map, getFaultAction()) ;
+ CoordinatorCompletionParticipantClient.getClient().sendSoapFault(soapFault, participant, map, getFaultAction()) ;
}
catch (final Throwable th)
{
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/BusinessActivityTerminatorStub.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/BusinessActivityTerminatorStub.java 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/stub/BusinessActivityTerminatorStub.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -215,6 +215,9 @@
public void error ()
throws SystemException
{
+/*
+ * Since it is never used this has been decommissioned due to problems with using the soap fault service to
+ * send a fault via a W3C endpoint. the latter is broken now that CXF helpfully puts metadata into the endpoint.
final MAP map = AddressingHelper.createNotificationContext(MessageId.getMessageId()) ;
final SoapFault soapFault = new SoapFault11(SoapFaultType.FAULT_SENDER, ArjunaTXConstants.UNKNOWNERROR_ERROR_CODE_QNAME,
WSTLogger.i18NLogger.get_wst11_stub_BusinessActivityTerminatorStub_1()) ;
@@ -226,6 +229,7 @@
{
throw new SystemException() ;
}
+*/
}
private static class RequestCallback extends TerminationParticipantCallback
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-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CompletionInitiatorPortType.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -1,6 +1,8 @@
package org.oasis_open.docs.ws_tx.wsat._2006._06;
+import org.jboss.jbossts.xts.soapfault.Fault;
+
import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebParam;
@@ -43,4 +45,13 @@
@WebParam(name = "Aborted", targetNamespace = "http://docs.oasis-open.org/ws-tx/wsat/2006/06", partName = "parameters")
Notification parameters);
+ /**
+ *
+ * @param parameters
+ */
+ @WebMethod(operationName = "SoapFault", action = "http://docs.oasis-open.org/ws-tx/wsat/2006/06/fault")
+ @Oneway
+ public void soapFault(
+ @WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "parameters")
+ Fault parameters);
}
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-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/CoordinatorPortType.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -1,6 +1,8 @@
package org.oasis_open.docs.ws_tx.wsat._2006._06;
+import org.jboss.jbossts.xts.soapfault.Fault;
+
import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebParam;
@@ -63,4 +65,13 @@
@WebParam(name = "Committed", targetNamespace = "http://docs.oasis-open.org/ws-tx/wsat/2006/06", partName = "parameters")
Notification parameters);
+ /**
+ *
+ * @param parameters
+ */
+ @WebMethod(operationName = "SoapFault", action = "http://docs.oasis-open.org/ws-tx/wsat/2006/06/fault")
+ @Oneway
+ public void soapFault(
+ @WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "parameters")
+ Fault parameters);
}
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-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsat/_2006/_06/ParticipantPortType.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -1,6 +1,8 @@
package org.oasis_open.docs.ws_tx.wsat._2006._06;
+import org.jboss.jbossts.xts.soapfault.Fault;
+
import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebParam;
@@ -44,7 +46,7 @@
Notification parameters);
/**
- *
+ *
* @param parameters
*/
@WebMethod(operationName = "RollbackOperation", action = "http://docs.oasis-open.org/ws-tx/wsat/2006/06/Rollback")
@@ -53,4 +55,13 @@
@WebParam(name = "Rollback", targetNamespace = "http://docs.oasis-open.org/ws-tx/wsat/2006/06", partName = "parameters")
Notification parameters);
+ /**
+ *
+ * @param parameters
+ */
+ @WebMethod(operationName = "SoapFault", action = "http://docs.oasis-open.org/ws-tx/wsat/2006/06/fault")
+ @Oneway
+ public void soapFault(
+ @WebParam(name = "Fault", targetNamespace = "http://schemas.xmlsoap.org/soap/envelope/", partName = "parameters")
+ Fault parameters);
}
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-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionCoordinatorPortType.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -1,6 +1,8 @@
package org.oasis_open.docs.ws_tx.wsba._2006._06;
+import org.jboss.jbossts.xts.soapfault.Fault;
+
import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebParam;
@@ -113,4 +115,13 @@
@WebParam(name = "Status", targetNamespace = "http://docs.oasis-open.org/ws-tx/wsba/2006/06", partName = "parameters")
StatusType parameters);
+ /**
+ *
+ * @param fault
+ */
+ @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")
+ 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-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithCoordinatorCompletionParticipantPortType.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -1,6 +1,8 @@
package org.oasis_open.docs.ws_tx.wsba._2006._06;
+import org.jboss.jbossts.xts.soapfault.Fault;
+
import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebParam;
@@ -113,4 +115,13 @@
@WebParam(name = "Status", targetNamespace = "http://docs.oasis-open.org/ws-tx/wsba/2006/06", partName = "parameters")
StatusType parameters);
+ /**
+ *
+ * @param fault
+ */
+ @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")
+ 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-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionCoordinatorPortType.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -1,6 +1,8 @@
package org.oasis_open.docs.ws_tx.wsba._2006._06;
+import org.jboss.jbossts.xts.soapfault.Fault;
+
import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebParam;
@@ -113,4 +115,13 @@
@WebParam(name = "Status", targetNamespace = "http://docs.oasis-open.org/ws-tx/wsba/2006/06", partName = "parameters")
StatusType parameters);
+ /**
+ *
+ * @param fault
+ */
+ @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")
+ 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-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/org/oasis_open/docs/ws_tx/wsba/_2006/_06/BusinessAgreementWithParticipantCompletionParticipantPortType.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -1,6 +1,8 @@
package org.oasis_open.docs.ws_tx.wsba._2006._06;
+import org.jboss.jbossts.xts.soapfault.Fault;
+
import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebParam;
@@ -103,4 +105,13 @@
@WebParam(name = "Status", targetNamespace = "http://docs.oasis-open.org/ws-tx/wsba/2006/06", partName = "parameters")
StatusType parameters);
+ /**
+ *
+ * @param fault
+ */
+ @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")
+ Fault fault);
}
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -98,14 +98,6 @@
id);
}
- public static W3CEndpointReference getCoordinatorFaultToEndpoint(String id)
- {
- return getEndpoint(SoapFaultConstants.SOAPFAULT_SERVICE_QNAME,
- SoapFaultConstants.SOAPFAULT_PORT_QNAME,
- coordinatorServiceURI,
- id);
- }
-
public static W3CEndpointReference getCompletionInitiatorEndpoint(String id)
{
return getEndpoint(AtomicTransactionConstants.COMPLETION_INITIATOR_SERVICE_QNAME,
@@ -114,14 +106,6 @@
id);
}
- public static W3CEndpointReference getCompletionInitiatorFaultToEndpoint(String id)
- {
- return getEndpoint(SoapFaultConstants.SOAPFAULT_SERVICE_QNAME,
- SoapFaultConstants.SOAPFAULT_PORT_QNAME,
- completionInitiatorServiceURI,
- id);
- }
-
public static W3CEndpointReference getCompletionCoordinatorEndpoint(String id)
{
return getEndpoint(AtomicTransactionConstants.COMPLETION_COORDINATOR_SERVICE_QNAME,
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionCoordinatorTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionCoordinatorTestCase.java 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/CompletionCoordinatorTestCase.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -145,7 +145,7 @@
final String messageId = "123456" ;
final String reason = "testSendErrorReason" ;
final String instanceIdentifier = "testSendError" ;
- final W3CEndpointReference completionInitiatorEndpoint = TestUtil.getCompletionInitiatorFaultToEndpoint(instanceIdentifier);
+ final W3CEndpointReference completionInitiatorEndpoint = TestUtil.getCompletionInitiatorEndpoint(instanceIdentifier);
final MAP map = AddressingHelper.createRequestContext(TestUtil.completionInitiatorServiceURI, messageId) ;
final SoapFaultType soapFaultType = SoapFaultType.FAULT_SENDER ;
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCParticipantTestCase.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCParticipantTestCase.java 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/junit/TwoPCParticipantTestCase.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -135,7 +135,7 @@
{
final String messageId = "testSendError" ;
final InstanceIdentifier instanceIdentifier = new InstanceIdentifier("5");
- W3CEndpointReference coordinatorEndpoint = TestUtil.getCoordinatorFaultToEndpoint(instanceIdentifier.getInstanceIdentifier());
+ W3CEndpointReference coordinatorEndpoint = TestUtil.getCoordinatorEndpoint(instanceIdentifier.getInstanceIdentifier());
final MAP map = AddressingHelper.createRequestContext(TestUtil.coordinatorServiceURI, messageId);
final String reason = "testSendErrorReason" ;
final SoapFaultType soapFaultType = SoapFaultType.FAULT_SENDER ;
Modified: labs/jbosstm/trunk/XTS/sar/tests/dd/WEB-INF/web.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/tests/dd/WEB-INF/web.xml 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/sar/tests/dd/WEB-INF/web.xml 2010-07-02 11:23:49 UTC (rev 33730)
@@ -35,58 +35,58 @@
<!-- Define Server endpoints and implementation classes -->
<servlet>
- <servlet-name>XTS Service Test Service One</servlet-name>
+ <servlet-name>XTS_Service_Test_Service_One</servlet-name>
<servlet-class>org.jboss.jbossts.xts.servicetests.service.XTSServiceTestPortTypeImpl</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
- <servlet-name>XTS Service Test Service Two</servlet-name>
+ <servlet-name>XTS_Service_Test_Service_Two</servlet-name>
<servlet-class>org.jboss.jbossts.xts.servicetests.service.XTSServiceTestPortTypeImpl</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
- <servlet-name>XTS Service Test Service Three</servlet-name>
+ <servlet-name>XTS_Service_Test_Service_Three</servlet-name>
<servlet-class>org.jboss.jbossts.xts.servicetests.service.XTSServiceTestPortTypeImpl</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
- <servlet-name>XTS Service Test Subordinate Service One</servlet-name>
+ <servlet-name>XTS_Service_Test_Subordinate_Service_One</servlet-name>
<servlet-class>org.jboss.jbossts.xts.servicetests.service.subordinate.XTSSubordinateServiceTestPortTypeImpl</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
- <servlet-name>XTS Service Test Web Runner</servlet-name>
+ <servlet-name>XTS_Service_Test_Web_Runner</servlet-name>
<servlet-class>org.jboss.jbossts.xts.servicetests.webbean.XTSHTTPServiceTestRunner</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<!-- Define Server Endpoint Mappings -->
<servlet-mapping>
- <servlet-name>XTS Service Test Service One</servlet-name>
+ <servlet-name>XTS_Service_Test_Service_One</servlet-name>
<url-pattern>/xtsservicetest1</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>XTS Service Test Service Two</servlet-name>
+ <servlet-name>XTS_Service_Test_Service_Two</servlet-name>
<url-pattern>/xtsservicetest2</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>XTS Service Test Service Three</servlet-name>
+ <servlet-name>XTS_Service_Test_Service_Three</servlet-name>
<url-pattern>/xtsservicetest3</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>XTS Service Test Subordinate Service One</servlet-name>
+ <servlet-name>XTS_Service_Test_Subordinate_Service_One</servlet-name>
<url-pattern>/xtssubordinateservicetest1</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>XTS Service Test Web Runner</servlet-name>
+ <servlet-name>XTS_Service_Test_Web_Runner</servlet-name>
<url-pattern>/</url-pattern>
</servlet-mapping>
</web-app>
Modified: labs/jbosstm/trunk/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/service/XTSServiceTestPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/service/XTSServiceTestPortTypeImpl.java 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/service/XTSServiceTestPortTypeImpl.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -43,7 +43,7 @@
*/
@WebService(targetNamespace = "http://jbossts.jboss.org/xts/servicetests/generated",
wsdlLocation = "WEB-INF/wsdl/xtsservicetests.wsdl",
- serviceName = "XTSServiceTest",
+ serviceName = "XTSServiceTestService",
portName = "XTSServiceTestPortType",
name = "XTSServiceTestPortType"
)
Modified: labs/jbosstm/trunk/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/service/subordinate/XTSSubordinateServiceTestPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/service/subordinate/XTSSubordinateServiceTestPortTypeImpl.java 2010-07-02 11:21:53 UTC (rev 33729)
+++ labs/jbosstm/trunk/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/service/subordinate/XTSSubordinateServiceTestPortTypeImpl.java 2010-07-02 11:23:49 UTC (rev 33730)
@@ -47,7 +47,7 @@
*/
@WebService(targetNamespace = "http://jbossts.jboss.org/xts/servicetests/generated",
wsdlLocation = "WEB-INF/wsdl/xtsservicetests.wsdl",
- serviceName = "XTSServiceTest",
+ serviceName = "XTSServiceTestService",
portName = "XTSServiceTestPortType",
name = "XTSServiceTestPortType"
)
More information about the jboss-svn-commits
mailing list