You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sc...@apache.org on 2011/11/15 15:38:03 UTC
svn commit: r1202210 -
/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
Author: scottkurz
Date: Tue Nov 15 14:38:02 2011
New Revision: 1202210
URL: http://svn.apache.org/viewvc?rev=1202210&view=rev
Log:
Fix EPR creation to correctly wrap address in <wsa:Address/> tag.
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
Modified: tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java?rev=1202210&r1=1202209&r2=1202210&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java Tue Nov 15 14:38:02 2011
@@ -75,6 +75,7 @@ public class JAXWSBindingInvoker impleme
private final static String SCA11_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
public static final String WSA_FINAL_NAMESPACE = "http://www.w3.org/2005/08/addressing";
+ public static final QName QNAME_WSA_ADDRESS = new QName(WSA_FINAL_NAMESPACE, "Address", "wsa");
public static final QName QNAME_WSA_FROM = new QName(WSA_FINAL_NAMESPACE, "From", "wsa");
public static final QName QNAME_WSA_TO = new QName(WSA_FINAL_NAMESPACE, "To", "wsa");
public static final QName QNAME_WSA_ACTION = new QName(WSA_FINAL_NAMESPACE, "Action", "wsa");
@@ -180,7 +181,6 @@ public class JAXWSBindingInvoker impleme
if (detail != null) {
for (Iterator i = detail.getDetailEntries(); i.hasNext();) {
DetailEntry entry = (DetailEntry)i.next();
- //FaultException fe = new FaultException(e.getMessage(), entry.getFirstChild(), e);
FaultException fe = new FaultException(e.getMessage(), entry, e);
fe.setFaultName(entry.getElementQName());
msg.setFaultBody(fe);
@@ -254,7 +254,8 @@ public class JAXWSBindingInvoker impleme
//
// addWSAFromHeader(sh, fromEPR);
SOAPHeaderElement fromH = sh.addHeaderElement(QNAME_WSA_FROM);
- fromH.setTextContent(callbackEndpoint.getBinding().getURI());
+ SOAPElement fromAddress = fromH.addChildElement(QNAME_WSA_ADDRESS);
+ fromAddress.setTextContent(callbackEndpoint.getBinding().getURI());
addWSAActionHeader(sh, action);
@@ -334,7 +335,8 @@ public class JAXWSBindingInvoker impleme
// wsaToOM.setText( address );
// sh.addChild(wsaToOM);
SOAPHeaderElement toH = sh.addHeaderElement(QNAME_WSA_TO);
- toH.setTextContent(address);
+ SOAPElement toAddress = toH.addChildElement(QNAME_WSA_ADDRESS);
+ toAddress.setTextContent(address);
// Deal with Reference Parameters, if present - copy to the header
// without the wsa:ReferenceParameters wrapper