From fd13d5d29110eeabef6a6cbf53032e3b2299aad5 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Fri, 19 Oct 2007 14:18:58 +0000 Subject: [PATCH] SWS-211 --- .../ws/soap/axiom/AxiomSoap11Body.java | 4 ++-- .../AbstractWsAddressingVersion.java | 21 ++++++++++--------- .../soap/addressing/WsAddressing200408.java | 6 ++++-- .../soap/addressing/WsAddressing200605.java | 6 ++++-- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap11Body.java b/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap11Body.java index 1e4ec83f..f28c85b5 100644 --- a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap11Body.java +++ b/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap11Body.java @@ -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); diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/AbstractWsAddressingVersion.java b/sandbox/src/main/java/org/springframework/ws/soap/addressing/AbstractWsAddressingVersion.java index 39717df6..5cd2a0aa 100644 --- a/sandbox/src/main/java/org/springframework/ws/soap/addressing/AbstractWsAddressingVersion.java +++ b/sandbox/src/main/java/org/springframework/ws/soap/addressing/AbstractWsAddressingVersion.java @@ -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 To addressing header. */ protected QName getToName() { - return new QName(getNamespaceUri(), "To", getNamespacePrefix()); + return QNameUtils.createQName(getNamespaceUri(), "To", getNamespacePrefix()); } /** Returns the qualified name of the From addressing header. */ protected QName getFromName() { - return new QName(getNamespaceUri(), "From", getNamespacePrefix()); + return QNameUtils.createQName(getNamespaceUri(), "From", getNamespacePrefix()); } /** Returns the qualified name of the ReplyTo addressing header. */ protected QName getReplyToName() { - return new QName(getNamespaceUri(), "ReplyTo", getNamespacePrefix()); + return QNameUtils.createQName(getNamespaceUri(), "ReplyTo", getNamespacePrefix()); } /** Returns the qualified name of the FaultTo addressing header. */ protected QName getFaultToName() { - return new QName(getNamespaceUri(), "FaultTo", getNamespacePrefix()); + return QNameUtils.createQName(getNamespaceUri(), "FaultTo", getNamespacePrefix()); } /** Returns the qualified name of the Action addressing header. */ protected QName getActionName() { - return new QName(getNamespaceUri(), "Action", getNamespacePrefix()); + return QNameUtils.createQName(getNamespaceUri(), "Action", getNamespacePrefix()); } /** Returns the qualified name of the MessageID addressing header. */ protected QName getMessageIdName() { - return new QName(getNamespaceUri(), "MessageID", getNamespacePrefix()); + return QNameUtils.createQName(getNamespaceUri(), "MessageID", getNamespacePrefix()); } /** Returns the qualified name of the RelatesTo 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 * null 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 * null 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 Address in EndpointReference. */ protected QName getAddressName() { - return new QName(getNamespaceUri(), "Address", getNamespacePrefix()); + return QNameUtils.createQName(getNamespaceUri(), "Address", getNamespacePrefix()); } /* diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200408.java b/sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200408.java index 5de937f9..052deb08 100644 --- a/sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200408.java +++ b/sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200408.java @@ -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() { diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200605.java b/sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200605.java index abea6c62..78ad38b4 100644 --- a/sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200605.java +++ b/sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200605.java @@ -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() {