You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/03/28 15:07:26 UTC
svn commit: r389494 -
/incubator/servicemix/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/AddressingHandler.java
Author: gnodet
Date: Tue Mar 28 05:07:25 2006
New Revision: 389494
URL: http://svn.apache.org/viewcvs?rev=389494&view=rev
Log:
Suppport "http://schemas.xmlsoap.org/ws/2004/03/addressing" WSA namespace
Modified:
incubator/servicemix/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/AddressingHandler.java
Modified: incubator/servicemix/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/AddressingHandler.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/AddressingHandler.java?rev=389494&r1=389493&r2=389494&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/AddressingHandler.java (original)
+++ incubator/servicemix/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/AddressingHandler.java Tue Mar 28 05:07:25 2006
@@ -39,6 +39,7 @@
public class AddressingHandler extends AbstractHandler {
public static final String WSA_NAMESPACE_200303 = "http://schemas.xmlsoap.org/ws/2003/03/addressing";
+ public static final String WSA_NAMESPACE_200403 = "http://schemas.xmlsoap.org/ws/2004/03/addressing";
public static final String WSA_NAMESPACE_200408 = "http://schemas.xmlsoap.org/ws/2004/08/addressing";
public static final String WSA_NAMESPACE_200508 = "http://www.w3.org/2005/08/addressing";
@@ -68,9 +69,7 @@
for (Iterator it = headers.keySet().iterator(); it.hasNext();) {
QName qname = (QName) it.next();
Object value = headers.get(qname);
- if (WSA_NAMESPACE_200303.equals(qname.getNamespaceURI()) ||
- WSA_NAMESPACE_200408.equals(qname.getNamespaceURI()) ||
- WSA_NAMESPACE_200508.equals(qname.getNamespaceURI())) {
+ if (isWSANamespace(qname.getNamespaceURI())) {
if (nsUri == null) {
nsUri = qname.getNamespaceURI();
} else if (!nsUri.equals(qname.getNamespaceURI())) {
@@ -102,9 +101,7 @@
for (Iterator it = headers.keySet().iterator(); it.hasNext();) {
QName qname = (QName) it.next();
Object value = headers.get(qname);
- if (WSA_NAMESPACE_200303.equals(qname.getNamespaceURI()) ||
- WSA_NAMESPACE_200408.equals(qname.getNamespaceURI()) ||
- WSA_NAMESPACE_200508.equals(qname.getNamespaceURI())) {
+ if (isWSANamespace(qname.getNamespaceURI())) {
if (EL_MESSAGE_ID.equals(qname.getLocalPart())) {
QName name = new QName(qname.getNamespaceURI(), EL_MESSAGE_ID, qname.getPrefix() != null ? qname.getPrefix() : WSA_PREFIX);
DocumentFragment df = createHeader(name, idGenerator.generateSanitizedId());
@@ -119,7 +116,14 @@
}
public void onFault(Context context) throws Exception {
-
+ // TODO: handle MessageID ?
+ }
+
+ protected boolean isWSANamespace(String ns) {
+ return WSA_NAMESPACE_200303.equals(ns) ||
+ WSA_NAMESPACE_200403.equals(ns) ||
+ WSA_NAMESPACE_200408.equals(ns) ||
+ WSA_NAMESPACE_200508.equals(ns);
}
protected String getHeaderText(Object header) {