[jboss-svn-commits] JBL Code SVN: r19950 - in labs/jbosstm/trunk/XTS: WS-T/dev/src11/com/arjuna/webservices11/wsat/client and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: adinn
Date: 2008-05-14 08:13:36 -0400 (Wed, 14 May 2008)
New Revision: 19950

Modified:
   labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/client/SoapFaultClient.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
Log:
removed unnecessary argument in SoapFaultClient method sendSoapFault and in callers

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	2008-05-14 11:23:56 UTC (rev 19949)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wsaddr/client/SoapFaultClient.java	2008-05-14 12:13:36 UTC (rev 19950)
@@ -57,7 +57,6 @@
      * @throws java.io.IOException for any transport errors.
      */
     public static void sendSoapFault(final SoapFault11 soapFault,
-                                     final InstanceIdentifier instanceIdentifier,
                                      final AddressingProperties addressingProperties,
                                      final AttributedURI action)
         throws SoapFault11, IOException
@@ -67,7 +66,7 @@
             soapFault.setAction(action.getURI().toString()) ;
         }
 
-        final SoapFaultPortType faultPort = getSoapFaultPort(instanceIdentifier, addressingProperties, action);
+        final SoapFaultPortType faultPort = getSoapFaultPort(addressingProperties, action);
         Fault fault = soapFault.toFault();
         faultPort.soapFault(fault);
     }
@@ -109,8 +108,7 @@
         return soapFaultService.get();
     }
 
-    private static SoapFaultPortType getSoapFaultPort(final InstanceIdentifier instanceIdentifier,
-                                                      final AddressingProperties addressingProperties,
+    private static SoapFaultPortType getSoapFaultPort(final AddressingProperties addressingProperties,
                                                       final AttributedURI action)
     {
         SoapFaultService service = getSoapFaultService();
@@ -125,7 +123,9 @@
         bindingProvider.getBinding().setHandlerChain(customHandlerChain);
 
         Map<String, Object> requestContext = bindingProvider.getRequestContext();
-        addressingProperties.setAction(action);
+        if (action != null) {
+            addressingProperties.setAction(action);
+        }
         requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, addressingProperties);
 	    // jbossws should do this for us . . .
 	    requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProperties);
@@ -145,7 +145,9 @@
         BindingProvider bindingProvider = (BindingProvider)port;
         Map<String, Object> requestContext = bindingProvider.getRequestContext();
         AddressingProperties requestProperties = (AddressingProperties)requestContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND);
-        addressingProperties.setAction(action);
+        if (action != null) {
+            addressingProperties.setAction(action);
+        }
         AddressingHelper.installCallerProperties(addressingProperties, requestProperties);
         AttributedURI toUri = requestProperties.getTo();
         List<Handler> customHandlerChain = new ArrayList<Handler>();

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	2008-05-14 11:23:56 UTC (rev 19949)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CompletionInitiatorClient.java	2008-05-14 12:13:36 UTC (rev 19950)
@@ -126,7 +126,7 @@
     {
         AddressingHelper.installFrom(addressingProperties, completionCoordinator, identifier);
         // use the SoapFaultService to format a soap fault and send it back to the faultto or from address
-        SoapFaultClient.sendSoapFault((SoapFault11)soapFault, identifier, addressingProperties, faultAction);
+        SoapFaultClient.sendSoapFault((SoapFault11)soapFault, addressingProperties, faultAction);
     }
 
     /**

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	2008-05-14 11:23:56 UTC (rev 19949)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/CoordinatorClient.java	2008-05-14 12:13:36 UTC (rev 19950)
@@ -170,7 +170,7 @@
     {
         AddressingHelper.installFrom(addressingProperties, participant, identifier);
         // use the SoapFaultService to format a soap fault and send it back to the faultto or from address
-        SoapFaultClient.sendSoapFault((SoapFault11)soapFault, identifier, addressingProperties, faultAction);
+        SoapFaultClient.sendSoapFault((SoapFault11)soapFault, addressingProperties, faultAction);
     }
 
     /**

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	2008-05-14 11:23:56 UTC (rev 19949)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/client/ParticipantClient.java	2008-05-14 12:13:36 UTC (rev 19950)
@@ -147,7 +147,7 @@
     {
         // use the SoapFaultService to format a soap fault and send it back to the faultto or from address
         AddressingHelper.installFrom(addressingProperties, coordinator, identifier);
-        SoapFaultClient.sendSoapFault((SoapFault11)soapFault, identifier, addressingProperties, faultAction);
+        SoapFaultClient.sendSoapFault((SoapFault11)soapFault, addressingProperties, faultAction);
     }
 
     /**