You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ch...@apache.org on 2006/05/04 21:41:42 UTC
svn commit: r399838 - in
/webservices/sandesha/trunk/src/org/apache/sandesha2:
handlers/SandeshaOutHandler.java util/MsgInitializer.java
wsrm/RMElements.java
Author: chamikara
Date: Thu May 4 12:41:40 2006
New Revision: 399838
URL: http://svn.apache.org/viewcvs?rev=399838&view=rev
Log:
Corrections to pick the correct addresing namespace in the RMElements class
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/MsgInitializer.java
webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/RMElements.java
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java?rev=399838&r1=399837&r2=399838&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java Thu May 4 12:41:40 2006
@@ -101,9 +101,6 @@
}
-
-
-
public QName getName() {
return new QName(Sandesha2Constants.OUT_HANDLER_NAME);
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/MsgInitializer.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/MsgInitializer.java?rev=399838&r1=399837&r2=399838&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/MsgInitializer.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/MsgInitializer.java Thu May 4 12:41:40 2006
@@ -17,6 +17,7 @@
package org.apache.sandesha2.util;
+import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.sandesha2.RMMsgContext;
@@ -75,7 +76,9 @@
private static void populateRMMsgContext(MessageContext msgCtx,
RMMsgContext rmMsgContext) throws SandeshaException {
- RMElements elements = new RMElements();
+ String addressingNamespace = (String) msgCtx.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
+
+ RMElements elements = new RMElements(addressingNamespace);
elements.fromSOAPEnvelope(msgCtx.getEnvelope(), msgCtx.getWSAAction());
String rmNamespace = null;
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/RMElements.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/RMElements.java?rev=399838&r1=399837&r2=399838&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/RMElements.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/RMElements.java Thu May 4 12:41:40 2006
@@ -52,6 +52,14 @@
private String rmNamespaceValue = null;
private String addressingNamespaceValue = null;
+ public RMElements () {
+
+ }
+
+ public RMElements (String addressingNamespace) {
+ this.addressingNamespaceValue = addressingNamespace;
+ }
+
public void fromSOAPEnvelope(SOAPEnvelope envelope, String action) throws SandeshaException {
if (envelope == null)
@@ -72,11 +80,12 @@
return;
}
- //finding out the addressing version.
- addressingNamespaceValue = getAddressingNamespaceValue (envelope,action);
- if (addressingNamespaceValue==null) {
- return;
+ String addressingNamespaceTmp = getAddressingNamespaceValue (envelope,action);
+ if (addressingNamespaceTmp!=null) {
+ addressingNamespaceValue = addressingNamespaceTmp;
}
+ if (addressingNamespaceValue==null)
+ addressingNamespaceValue = AddressingConstants.Final.WSA_NAMESPACE; //Final is the default version for addressing
OMElement sequenceElement = envelope.getHeader().getFirstChildWithName(
new QName(rmNamespaceValue, Sandesha2Constants.WSRM_COMMON.SEQUENCE));
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org