Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SWS-211

Browse Source
This commit is contained in:
Arjen Poutsma
2007-10-19 14:18:58 +00:00
parent 570cdb3bf9
commit fd13d5d291
4 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap11Body.java
View File

@@ -118,8 +118,8 @@ class AxiomSoap11Body extends AxiomSoapBody implements Soap11Body {
detachAllBodyChildren();
SOAPFault fault = getAxiomFactory().createSOAPFault(getAxiomBody());
SOAPFaultCode faultCode = getAxiomFactory().createSOAPFaultCode(fault);
faultCode.setText(
new QName(fault.getNamespace().getNamespaceURI(), localName, fault.getNamespace().getPrefix()));
faultCode.setText(QNameUtils.createQName(fault.getNamespace().getNamespaceURI(), localName,
fault.getNamespace().getPrefix()));
SOAPFaultReason faultReason = getAxiomFactory().createSOAPFaultReason(fault);
if (locale != null) {
addLangAttribute(locale, faultReason);

21
sandbox/src/main/java/org/springframework/ws/soap/addressing/AbstractWsAddressingVersion.java
View File

@@ -35,6 +35,7 @@ import org.springframework.ws.soap.SoapMessage;
import org.springframework.ws.soap.soap11.Soap11Body;
import org.springframework.ws.soap.soap12.Soap12Body;
import org.springframework.ws.soap.soap12.Soap12Fault;
import org.springframework.xml.namespace.QNameUtils;
import org.springframework.xml.transform.TransformerObjectSupport;
import org.springframework.xml.xpath.XPathExpression;
import org.springframework.xml.xpath.XPathExpressionFactory;
@@ -237,37 +238,37 @@ public abstract class AbstractWsAddressingVersion extends TransformerObjectSuppo
/** Returns the qualified name of the <code>To</code> addressing header. */
protected QName getToName() {
return new QName(getNamespaceUri(), "To", getNamespacePrefix());
return QNameUtils.createQName(getNamespaceUri(), "To", getNamespacePrefix());
}
/** Returns the qualified name of the <code>From</code> addressing header. */
protected QName getFromName() {
return new QName(getNamespaceUri(), "From", getNamespacePrefix());
return QNameUtils.createQName(getNamespaceUri(), "From", getNamespacePrefix());
}
/** Returns the qualified name of the <code>ReplyTo</code> addressing header. */
protected QName getReplyToName() {
return new QName(getNamespaceUri(), "ReplyTo", getNamespacePrefix());
return QNameUtils.createQName(getNamespaceUri(), "ReplyTo", getNamespacePrefix());
}
/** Returns the qualified name of the <code>FaultTo</code> addressing header. */
protected QName getFaultToName() {
return new QName(getNamespaceUri(), "FaultTo", getNamespacePrefix());
return QNameUtils.createQName(getNamespaceUri(), "FaultTo", getNamespacePrefix());
}
/** Returns the qualified name of the <code>Action</code> addressing header. */
protected QName getActionName() {
return new QName(getNamespaceUri(), "Action", getNamespacePrefix());
return QNameUtils.createQName(getNamespaceUri(), "Action", getNamespacePrefix());
}
/** Returns the qualified name of the <code>MessageID</code> addressing header. */
protected QName getMessageIdName() {
return new QName(getNamespaceUri(), "MessageID", getNamespacePrefix());
return QNameUtils.createQName(getNamespaceUri(), "MessageID", getNamespacePrefix());
}
/** Returns the qualified name of the <code>RelatesTo</code> addressing header. */
protected QName getRelatesToName() {
return new QName(getNamespaceUri(), "RelatesTo", getNamespacePrefix());
return QNameUtils.createQName(getNamespaceUri(), "RelatesTo", getNamespacePrefix());
}
/**
@@ -275,7 +276,7 @@ public abstract class AbstractWsAddressingVersion extends TransformerObjectSuppo
* <code>null</code> when reference properties are not supported by this version of the spec.
*/
protected QName getReferencePropertiesName() {
return new QName(getNamespaceUri(), "ReferenceProperties", getNamespacePrefix());
return QNameUtils.createQName(getNamespaceUri(), "ReferenceProperties", getNamespacePrefix());
}
/**
@@ -283,7 +284,7 @@ public abstract class AbstractWsAddressingVersion extends TransformerObjectSuppo
* <code>null</code> when reference parameters are not supported by this version of the spec.
*/
protected QName getReferenceParametersName() {
return new QName(getNamespaceUri(), "ReferenceParameters", getNamespacePrefix());
return QNameUtils.createQName(getNamespaceUri(), "ReferenceParameters", getNamespacePrefix());
}
/*
@@ -292,7 +293,7 @@ public abstract class AbstractWsAddressingVersion extends TransformerObjectSuppo
/** The qualified name of the <code>Address</code> in <code>EndpointReference</code>. */
protected QName getAddressName() {
return new QName(getNamespaceUri(), "Address", getNamespacePrefix());
return QNameUtils.createQName(getNamespaceUri(), "Address", getNamespacePrefix());
}
/*

6
sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200408.java
View File

@@ -18,6 +18,8 @@ package org.springframework.ws.soap.addressing;
import javax.xml.namespace.QName;
import org.springframework.xml.namespace.QNameUtils;
/**
* Implements the August 2004 edition of the WS-Addressing specification. This version of the specification is used by
* Microsoft's Web Services Enhancements (WSE) 3.0, and supported by Axis 1 and 2, and XFire.
@@ -39,7 +41,7 @@ public class WsAddressing200408 extends AbstractWsAddressingVersion {
}
protected final QName getInvalidAddressingHeaderFaultSubcode() {
return new QName(NAMESPACE_URI, "InvalidMessageInformationHeader", getNamespacePrefix());
return QNameUtils.createQName(NAMESPACE_URI, "InvalidMessageInformationHeader", getNamespacePrefix());
}
protected final String getMessageAddressingHeaderRequiredFaultReason() {
@@ -47,7 +49,7 @@ public class WsAddressing200408 extends AbstractWsAddressingVersion {
}
protected final QName getMessageAddressingHeaderRequiredFaultSubcode() {
return new QName(NAMESPACE_URI, "MessageInformationHeaderRequired", getNamespacePrefix());
return QNameUtils.createQName(NAMESPACE_URI, "MessageInformationHeaderRequired", getNamespacePrefix());
}
protected final String getNamespaceUri() {

6
sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200605.java
View File

@@ -18,6 +18,8 @@ package org.springframework.ws.soap.addressing;
import javax.xml.namespace.QName;
import org.springframework.xml.namespace.QNameUtils;
/**
* Implements the May 2006 edition of the WS-Addressing specification. This version of the specification is used by
* Microsoft's Windows Communication Foundation (WCF), and supported by Axis 1 and 2.
@@ -48,7 +50,7 @@ public class WsAddressing200605 extends AbstractWsAddressingVersion {
}
protected final QName getMessageAddressingHeaderRequiredFaultSubcode() {
return new QName(NAMESPACE_URI, "MessageAddressingHeaderRequired", getNamespacePrefix());
return QNameUtils.createQName(NAMESPACE_URI, "MessageAddressingHeaderRequired", getNamespacePrefix());
}
protected final String getMessageAddressingHeaderRequiredFaultReason() {
@@ -56,7 +58,7 @@ public class WsAddressing200605 extends AbstractWsAddressingVersion {
}
protected QName getInvalidAddressingHeaderFaultSubcode() {
return new QName(NAMESPACE_URI, "InvalidAddressingHeader", getNamespacePrefix());
return QNameUtils.createQName(NAMESPACE_URI, "InvalidAddressingHeader", getNamespacePrefix());
}
protected String getInvalidAddressingHeaderFaultReason() {