[jboss-svn-commits] JBL Code SVN: r19951 - in labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices: atinterop/processors and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed May 14 08:14:47 EDT 2008
Author: adinn
Date: 2008-05-14 08:14:47 -0400 (Wed, 14 May 2008)
New Revision: 19951
Modified:
labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java
labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java
labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java
labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java
labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java
labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java
Log:
modified to use SoapFaultClient to send faults rather than accessing SoapFaultService directly
Modified: labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java
===================================================================
--- labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java 2008-05-14 12:13:36 UTC (rev 19950)
+++ labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/client/InitiatorClient.java 2008-05-14 12:14:47 UTC (rev 19951)
@@ -9,6 +9,7 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices.SoapFaultType;
import com.arjuna.webservices11.SoapFault11;
+import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
import com.jboss.transaction.txinterop.webservices.atinterop.ATInteropConstants;
import com.jboss.transaction.txinterop.webservices.atinterop.generated.InitiatorPortType;
@@ -21,7 +22,6 @@
import javax.xml.namespace.QName;
import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler;
-import org.jboss.jbossts.xts.soapfault.SoapFaultPortType;
import org.jboss.jbossts.xts.soapfault.SoapFaultService;
/**
@@ -78,63 +78,21 @@
public void sendSoapFault(final AddressingProperties addressingProperties, final SoapFault11 soapFault)
throws SoapFault, IOException
{
- // TODO cannot send a soap fault using JaxWS so rethrow the soap fault for the caller to log
- // this means an async client will get wedged but that's the interop spec's fault!
- // the interop spec wsdl really ought to specify soap faults on the operations
-
- //final String soapFaultAction = soapFault.getAction() ;
- //if (soapFaultAction != null)
- //{
- // addressingContext.setAction(new AttributedURIType(soapFaultAction)) ;
- //}
- //WSAddr2005Client.sendSoapFault(soapFault, addressingContext, soapDetails, soapService) ;
-
- SoapFaultPortType port = getSoapFaultPort(addressingProperties);
- port.soapFault(soapFault.toFault());
- }
-
- /**
- * fetch a coordinator activation service unique to the current thread
- * @return
- */
- private static synchronized SoapFaultService getSoapFaultService()
- {
- if (soapFaultService.get() == null) {
- soapFaultService.set(new SoapFaultService());
+ String soapFaultAction = soapFault.getAction() ;
+ AttributedURI actionURI = null;
+ if (soapFaultAction == null)
+ {
+ soapFaultAction = faultAction;
}
- return soapFaultService.get();
- }
-
- private SoapFaultPortType getSoapFaultPort(AddressingProperties addressingProperties)
- {
- SoapFaultService service = getSoapFaultService();
- SoapFaultPortType port = service.getPort(SoapFaultPortType.class);
- BindingProvider bindingProvider = (BindingProvider)port;
- AddressingProperties faultAddressingProperties = builder.newAddressingProperties();
- faultAddressingProperties.initializeAsReply(addressingProperties, true);
- AttributedURI toUri = faultAddressingProperties.getTo();
- List<Handler> customHandlerChain = new ArrayList<Handler>();
- /*
- * we have to add the JaxWS WSAddressingClientHandler because we cannot specify the WSAddressing feature
- */
- customHandlerChain.add(new WSAddressingClientHandler());
- bindingProvider.getBinding().setHandlerChain(customHandlerChain);
-
- Map<String, Object> requestContext = bindingProvider.getRequestContext();
- requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, faultAddressingProperties);
- // jbossws should do this for us . . .
- requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, faultAddressingProperties);
- requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, toUri.getURI().toString());
try {
- faultAddressingProperties.setAction(builder.newURI(faultAction));
- } catch (URISyntaxException use) {
- // TODO log this error
+ actionURI = builder.newURI(soapFaultAction);
+ } catch (URISyntaxException e) {
+ // TODO log error here
}
- return port;
+ SoapFaultClient.sendSoapFault(soapFault, addressingProperties, actionURI);
}
- private static final ThreadLocal<SoapFaultService> soapFaultService = new ThreadLocal<SoapFaultService>();
private static final String faultAction = "http://fabrikam123.com/SoapFault";
private static final AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
/**
Modified: labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java
===================================================================
--- labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java 2008-05-14 12:13:36 UTC (rev 19950)
+++ labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/processors/ATParticipantProcessor.java 2008-05-14 12:14:47 UTC (rev 19951)
@@ -61,10 +61,10 @@
* Execute the CompletionCommit
* @param coordinatorURI The address of the coordinator to employ
* @param addressingProperties The current addressing context.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void completionCommit(final String coordinatorURI, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -83,10 +83,10 @@
* @param coordinatorURI The address of the coordinator to employ.
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void completionRollback(final String coordinatorURI, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -104,10 +104,10 @@
* Execute the Commit
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void commit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -123,10 +123,10 @@
* Execute the Rollback
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void rollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -142,10 +142,10 @@
* Execute the Phase2Rollback
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void phase2Rollback(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -162,10 +162,10 @@
* Execute the Readonly
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void readonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -182,10 +182,10 @@
* Execute the VolatileAndDurable
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void volatileAndDurable(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -201,10 +201,10 @@
* Execute the EarlyReadonly
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void earlyReadonly(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -222,10 +222,10 @@
* Execute the EarlyAborted
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void earlyAborted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -243,10 +243,10 @@
* Execute the ReplayCommit
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void replayCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -264,10 +264,10 @@
* Execute the RetryPreparedCommit
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void retryPreparedCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -284,10 +284,10 @@
* Execute the RetryPreparedAbort
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void retryPreparedAbort(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -303,10 +303,10 @@
* Execute the RetryCommit
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void retryCommit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -322,10 +322,10 @@
* Execute the PreparedAfterTimeout
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void preparedAfterTimeout(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -342,10 +342,10 @@
* Execute the LostCommitted
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void lostCommitted(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
Modified: labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java 2008-05-14 12:13:36 UTC (rev 19950)
+++ labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/atinterop/sei/ParticipantPortTypeImpl.java 2008-05-14 12:14:47 UTC (rev 19951)
@@ -59,7 +59,7 @@
AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
try {
ATParticipantProcessor.getParticipant().completionCommit(parameters, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -81,7 +81,7 @@
AddressingProperties inboundAddressProperties = (AddressingProperties)ctx.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
try {
ATParticipantProcessor.getParticipant().completionRollback(parameters, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -101,7 +101,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
ATParticipantProcessor.getParticipant().commit(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -121,7 +121,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
ATParticipantProcessor.getParticipant().rollback(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -141,7 +141,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
ATParticipantProcessor.getParticipant().phase2Rollback(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -161,7 +161,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
ATParticipantProcessor.getParticipant().readonly(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -181,7 +181,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
ATParticipantProcessor.getParticipant().volatileAndDurable(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -201,7 +201,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
ATParticipantProcessor.getParticipant().earlyReadonly(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -221,7 +221,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
ATParticipantProcessor.getParticipant().earlyAborted(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -241,7 +241,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
ATParticipantProcessor.getParticipant().replayCommit(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -261,7 +261,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
ATParticipantProcessor.getParticipant().retryPreparedCommit(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -281,7 +281,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
ATParticipantProcessor.getParticipant().retryPreparedAbort(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -301,7 +301,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
ATParticipantProcessor.getParticipant().retryCommit(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -321,7 +321,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
ATParticipantProcessor.getParticipant().preparedAfterTimeout(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -341,7 +341,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
ATParticipantProcessor.getParticipant().lostCommitted(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -371,10 +371,10 @@
*
* @param inboundAddressProperties identifes who to reply to and what message id the fault message should relate to
*/
- private void sendSoapFault(AddressingProperties inboundAddressProperties, SoapFault sf)
+ private void sendSoapFault(AddressingProperties inboundAddressProperties, SoapFault11 sf)
{
try {
- InitiatorClient.getClient().sendSoapFault(inboundAddressProperties, (SoapFault11)sf);
+ InitiatorClient.getClient().sendSoapFault(inboundAddressProperties, sf);
} catch (Throwable th) {
System.out.println("com.jboss.transaction.txinterop.webservices.atinterop.sei.ParticipantPortTypeImpl_2: unable to log soap fault " + sf);
throw new ProtocolException(th);
Modified: labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java
===================================================================
--- labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java 2008-05-14 12:13:36 UTC (rev 19950)
+++ labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/client/InitiatorClient.java 2008-05-14 12:14:47 UTC (rev 19951)
@@ -1,12 +1,17 @@
package com.jboss.transaction.txinterop.webservices.bainterop.client;
import java.io.IOException;
+import java.net.URISyntaxException;
import com.arjuna.webservices.SoapFault;
+import com.arjuna.webservices11.wsaddr.client.SoapFaultClient;
+import com.arjuna.webservices11.SoapFault11;
import com.jboss.transaction.txinterop.webservices.bainterop.BAInteropConstants;
import com.jboss.transaction.txinterop.webservices.bainterop.generated.InitiatorPortType;
import javax.xml.ws.addressing.AddressingProperties;
+import javax.xml.ws.addressing.AttributedURI;
+import javax.xml.ws.addressing.AddressingBuilder;
/**
* The initiator client.
@@ -59,20 +64,22 @@
* @throws SoapFault For any errors.
* @throws IOException for any transport errors.
*/
- public void sendSoapFault(final AddressingProperties addressingProperties, final SoapFault soapFault)
+ public void sendSoapFault(final AddressingProperties addressingProperties, final SoapFault11 soapFault)
throws SoapFault, IOException
{
- // TODO cannot send a soap fault using JaxWS so rethrow the soap fault for the caller to log
- // this means an async client will get wedged but that's the interop spec's fault!
- // the interop spec wsdl really ought to specify soap faults on the operations
+ String soapFaultAction = soapFault.getAction() ;
+ AttributedURI actionURI = null;
+ if (soapFaultAction == null)
+ {
+ soapFaultAction = faultAction;
+ }
+ try {
+ actionURI = builder.newURI(soapFaultAction);
+ } catch (URISyntaxException e) {
+ // TODO log error here
+ }
- //final String soapFaultAction = soapFault.getAction() ;
- //if (soapFaultAction != null)
- //{
- // addressingContext.setAction(new AttributedURIType(soapFaultAction)) ;
- //}
- //WSAddr2005Client.sendSoapFault(soapFault, addressingContext, soapDetails, soapService) ;
- throw soapFault;
+ SoapFaultClient.sendSoapFault(soapFault, addressingProperties, actionURI);
}
/**
@@ -83,4 +90,7 @@
{
return CLIENT ;
}
+
+ private static final String faultAction = "http://fabrikam123.com/SoapFault";
+ private static final AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
}
Modified: labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java
===================================================================
--- labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java 2008-05-14 12:13:36 UTC (rev 19950)
+++ labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/processors/BAParticipantProcessor.java 2008-05-14 12:14:47 UTC (rev 19951)
@@ -62,10 +62,10 @@
* Execute the Cancel
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void cancel(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -81,10 +81,10 @@
* Execute the Exit
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void exit(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -103,10 +103,10 @@
* Execute the Fail
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void fail(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -125,10 +125,10 @@
* Execute the CannotComplete
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void cannotComplete(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -147,10 +147,10 @@
* Execute the ParticipantCompleteClose
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void participantCompleteClose(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -169,10 +169,10 @@
* Execute the CoordinatorCompleteClose
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void coordinatorCompleteClose(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -188,10 +188,10 @@
* Execute the UnsolicitedComplete
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void unsolicitedComplete(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -210,10 +210,10 @@
* Execute the Compensate
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void compensate(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -232,10 +232,10 @@
* Execute the ParticipantCompensationFail
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void participantCompensationFail(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -254,10 +254,10 @@
* Execute the ParticipantCancelCompletedRace
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void participantCancelCompletedRace(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -276,10 +276,10 @@
* Execute the MessageLossAndRecovery
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void messageLossAndRecovery(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
try
{
@@ -295,10 +295,10 @@
* Execute the MixedOutcome
* @param addressingProperties The current addressing context.
* @return The response.
- * @throws SoapFault for errors during processing
+ * @throws SoapFault11 for errors during processing
*/
public void mixedOutcome(final CoordinationContextType coordinationContext, final AddressingProperties addressingProperties)
- throws SoapFault
+ throws SoapFault11
{
}
}
\ No newline at end of file
Modified: labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java
===================================================================
--- labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java 2008-05-14 12:13:36 UTC (rev 19950)
+++ labs/jbosstm/workspace/interop/WSTX11-interop/src/com/jboss/transaction/txinterop/webservices/bainterop/sei/ParticipantPortTypeImpl.java 2008-05-14 12:14:47 UTC (rev 19951)
@@ -55,7 +55,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
BAParticipantProcessor.getParticipant().cancel(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -75,7 +75,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
BAParticipantProcessor.getParticipant().exit(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -95,7 +95,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
BAParticipantProcessor.getParticipant().fail(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -115,7 +115,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
BAParticipantProcessor.getParticipant().cannotComplete(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -135,7 +135,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
BAParticipantProcessor.getParticipant().participantCompleteClose(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -155,7 +155,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
BAParticipantProcessor.getParticipant().coordinatorCompleteClose(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -175,7 +175,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
BAParticipantProcessor.getParticipant().unsolicitedComplete(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -195,7 +195,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
BAParticipantProcessor.getParticipant().compensate(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -215,7 +215,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
BAParticipantProcessor.getParticipant().participantCompensationFail(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -235,7 +235,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
BAParticipantProcessor.getParticipant().participantCancelCompletedRace(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -255,7 +255,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
BAParticipantProcessor.getParticipant().messageLossAndRecovery(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -275,7 +275,7 @@
CoordinationContextType coordinationContext = CoordinationContextManager.getContext(ctx);
try {
BAParticipantProcessor.getParticipant().mixedOutcome(coordinationContext, inboundAddressProperties);
- } catch (SoapFault sf) {
+ } catch (SoapFault11 sf) {
sendSoapFault(inboundAddressProperties, sf);
return;
}
@@ -305,7 +305,7 @@
*
* @param inboundAddressProperties identifes who to reply to and what message id the fault message should relate to
*/
- private void sendSoapFault(AddressingProperties inboundAddressProperties, SoapFault sf)
+ private void sendSoapFault(AddressingProperties inboundAddressProperties, SoapFault11 sf)
{
AddressingProperties outboundAddressProperties = AddressingHelper.createResponseContext(inboundAddressProperties, MessageId.getMessageId());
More information about the jboss-svn-commits
mailing list