Author: dkulp
Date: Mon Jan 19 12:22:54 2009
New Revision: 735791
URL: http://svn.apache.org/viewvc?rev=735791&view=rev
Log:
Merged revisions 735782 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r735782 | dkulp | 2009-01-19 14:45:08 -0500 (Mon, 19 Jan 2009) | 2 lines
[CXF-1993] Allow adding specific namespaces to soap:envolope
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapMessage.java
cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
cxf/branches/2.1.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettySpringTypesFactory.java
(props changed)
cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 19 12:22:54 2009
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732827,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732827,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735782
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapMessage.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapMessage.java?rev=735791&r1=735790&r2=735791&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapMessage.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapMessage.java
Mon Jan 19 12:22:54 2009
@@ -21,6 +21,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import javax.xml.namespace.QName;
@@ -52,7 +53,7 @@
}
return heads;
}
-
+
public boolean hasHeader(QName qn) {
for (Header head : getHeaders()) {
if (head.getName().equals(qn)) {
@@ -74,4 +75,13 @@
return containsKey(Header.HEADER_LIST) && getHeaders().size() > 0;
}
+ public Map<String, String> getEnvelopeNs() {
+ return CastUtils.cast((Map<? , ?>)get("soap.env.ns.map"));
+ }
+
+ public boolean hasAdditionalEnvNs() {
+ Map<String, String> ns = getEnvelopeNs();
+ return ns != null && !ns.isEmpty();
+ }
+
}
Modified:
cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java?rev=735791&r1=735790&r2=735791&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
Mon Jan 19 12:22:54 2009
@@ -22,6 +22,7 @@
import java.io.OutputStream;
import java.util.List;
+import java.util.Map;
import java.util.ResourceBundle;
import javax.xml.stream.XMLStreamException;
@@ -94,16 +95,35 @@
final SoapVersion soapVersion = message.getVersion();
try {
XMLStreamWriter xtw = message.getContent(XMLStreamWriter.class);
- xtw.setPrefix(soapVersion.getPrefix(), soapVersion.getNamespace());
- xtw.writeStartElement(soapVersion.getPrefix(),
- soapVersion.getEnvelope().getLocalPart(),
- soapVersion.getNamespace());
- xtw.writeNamespace(soapVersion.getPrefix(),
soapVersion.getNamespace());
-
+ String soapPrefix = soapVersion.getPrefix();
+ if (message.hasAdditionalEnvNs()) {
+ Map<String, String> nsMap = message.getEnvelopeNs();
+ for (Map.Entry<String, String> entry : nsMap.entrySet()) {
+ if (soapVersion.getNamespace().equals(entry.getValue())) {
+ soapPrefix = entry.getKey();
+ }
+ }
+ xtw.setPrefix(soapPrefix, soapVersion.getNamespace());
+ xtw.writeStartElement(soapPrefix,
+ soapVersion.getEnvelope().getLocalPart(),
+ soapVersion.getNamespace());
+ xtw.writeNamespace(soapPrefix, soapVersion.getNamespace());
+ for (Map.Entry<String, String> entry : nsMap.entrySet()) {
+ if (!soapVersion.getNamespace().equals(entry.getValue())) {
+ xtw.writeNamespace(entry.getKey(), entry.getValue());
+ }
+ }
+ } else {
+ xtw.setPrefix(soapPrefix, soapVersion.getNamespace());
+ xtw.writeStartElement(soapPrefix,
+ soapVersion.getEnvelope().getLocalPart(),
+ soapVersion.getNamespace());
+ xtw.writeNamespace(soapPrefix, soapVersion.getNamespace());
+ }
boolean preexistingHeaders = message.hasHeaders();
if (preexistingHeaders) {
- xtw.writeStartElement(soapVersion.getPrefix(),
+ xtw.writeStartElement(soapPrefix,
soapVersion.getHeader().getLocalPart(),
soapVersion.getNamespace());
List<Header> hdrList = message.getHeaders();
@@ -111,7 +131,7 @@
XMLStreamWriter writer = xtw;
if (header instanceof SoapHeader) {
SoapHeader soapHeader = (SoapHeader)header;
- writer = new SOAPHeaderWriter(xtw, soapHeader,
soapVersion);
+ writer = new SOAPHeaderWriter(xtw, soapHeader,
soapVersion, soapPrefix);
}
DataBinding b = header.getDataBinding();
if (b == null) {
@@ -132,12 +152,12 @@
}
}
}
- boolean endedHeader = handleHeaderPart(preexistingHeaders,
message);
+ boolean endedHeader = handleHeaderPart(preexistingHeaders,
message, soapPrefix);
if (preexistingHeaders && !endedHeader) {
xtw.writeEndElement();
}
- xtw.writeStartElement(soapVersion.getPrefix(),
+ xtw.writeStartElement(soapPrefix,
soapVersion.getBody().getLocalPart(),
soapVersion.getNamespace());
@@ -148,7 +168,7 @@
}
}
- private boolean handleHeaderPart(boolean preexistingHeaders, SoapMessage
message) {
+ private boolean handleHeaderPart(boolean preexistingHeaders, SoapMessage
message, String soapPrefix) {
//add MessagePart to soapHeader if necessary
boolean endedHeader = false;
Exchange exchange = message.getExchange();
@@ -194,7 +214,7 @@
objs.remove(part);
if (!(startedHeader || preexistingHeaders)) {
try {
- xtw.writeStartElement(soapVersion.getPrefix(),
+ xtw.writeStartElement(soapPrefix,
soapVersion.getHeader().getLocalPart(),
soapVersion.getNamespace());
} catch (XMLStreamException e) {
@@ -264,14 +284,18 @@
public static class SOAPHeaderWriter extends DelegatingXMLStreamWriter {
final SoapHeader soapHeader;
final SoapVersion soapVersion;
+ final String soapPrefix;
boolean firstDone;
+
public SOAPHeaderWriter(XMLStreamWriter writer,
SoapHeader header,
- SoapVersion version) {
+ SoapVersion version,
+ String pfx) {
super(writer);
soapHeader = header;
soapVersion = version;
+ soapPrefix = pfx;
}
public void writeAttribute(String prefix, String uri, String local,
String value)
@@ -296,13 +320,13 @@
if (!firstDone) {
firstDone = true;
if (!StringUtils.isEmpty(soapHeader.getActor())) {
- super.writeAttribute(soapVersion.getPrefix(),
+ super.writeAttribute(soapPrefix,
soapVersion.getNamespace(),
soapVersion.getAttrNameRole(),
soapHeader.getActor());
}
if (soapHeader.isMustUnderstand()) {
- super.writeAttribute(soapVersion.getPrefix(),
+ super.writeAttribute(soapPrefix,
soapVersion.getNamespace(),
soapVersion.getAttrNameMustUnderstand(),
"true");
Propchange:
cxf/branches/2.1.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettySpringTypesFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 19 12:22:54 2009
@@ -1 +1 @@
-/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettySpringTypesFactory.java:735252,735722-735723,735729,735734
+/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettySpringTypesFactory.java:735252,735722-735723,735729,735734,735782
Modified:
cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java?rev=735791&r1=735790&r2=735791&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
Mon Jan 19 12:22:54 2009
@@ -359,14 +359,25 @@
private void addMustUnderstandAttribute(Element header,
QName name,
- SoapVersion version,
+ SoapMessage msg,
AddressingPropertiesImpl maps) {
if (maps.getMustUnderstand().contains(name)) {
Element lastAdded = (Element)header.getLastChild();
+ String pfx = msg.getVersion().getPrefix();
+ if (msg.hasAdditionalEnvNs()) {
+ String ns = msg.getVersion().getNamespace();
+ Map<String, String> nsMap = msg.getEnvelopeNs();
+ for (Map.Entry<String, String> entry : nsMap.entrySet()) {
+ if (ns.equals(entry.getValue())) {
+ pfx = entry.getKey();
+ }
+ }
+ }
+
Attr mustUnderstandAttr =
lastAdded.getOwnerDocument().createAttributeNS(
- version.getNamespace(),
- version.getPrefix() + ":mustUnderstand");
+ msg.getVersion().getNamespace(),
+ pfx + ":mustUnderstand");
mustUnderstandAttr.setTextContent("1");
lastAdded.setAttributeNodeNS(mustUnderstandAttr);
}
@@ -403,7 +414,7 @@
}
addMustUnderstandAttribute(header,
name,
- message.getVersion(),
+ message,
maps);
}
