Author: asankha
Date: Tue May 22 23:16:21 2007
New Revision: 540852
URL: http://svn.apache.org/viewvc?view=rev&rev=540852
Log:
add ability to read MessageID as well from the SOAP message as per our
documentation
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Constants.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Constants.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Constants.java?view=diff&rev=540852&r1=540851&r2=540852
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Constants.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Constants.java
Tue May 22 23:16:21 2007
@@ -121,6 +121,8 @@
String HEADER_ACTION = "Action";
/** Refers the ReplyTo header */
String HEADER_REPLY_TO = "ReplyTo";
+ /** Refers the MessageID header */
+ String HEADER_MESSAGE_ID = "MessageID";
String RESPONSE = "RESPONSE";
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java?view=diff&rev=540852&r1=540851&r2=540852
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
Tue May 22 23:16:21 2007
@@ -104,23 +104,27 @@
return null;
}
if (Constants.SCOPE_DEFAULT.equals(scope)) {
- Object result = synCtx.getProperty(key);
- if (result != null) {
- return result;
+
+ if (Constants.HEADER_TO.equals(key) && synCtx.getTo() != null) {
+ return synCtx.getTo().getAddress();
+ } else if (Constants.HEADER_FROM.equals(key) && synCtx.getFrom()
!= null) {
+ return synCtx.getFrom().getAddress();
+ } else if (Constants.HEADER_ACTION.equals(key) &&
synCtx.getWSAAction() != null) {
+ return synCtx.getWSAAction();
+ } else if (Constants.HEADER_FAULT.equals(key) &&
synCtx.getFaultTo() != null) {
+ return synCtx.getFaultTo().getAddress();
+ } else if (Constants.HEADER_REPLY_TO.equals(key) &&
synCtx.getReplyTo() != null) {
+ return synCtx.getReplyTo().getAddress();
+ } else if (Constants.HEADER_MESSAGE_ID.equals(key) &&
synCtx.getMessageID() != null) {
+ return synCtx.getMessageID();
} else {
- if (Constants.HEADER_TO.equals(key) && synCtx.getTo() != null)
{
- return synCtx.getTo().getAddress();
- } else if (Constants.HEADER_FROM.equals(key) &&
synCtx.getFrom() != null) {
- return synCtx.getFrom().getAddress();
- } else if (Constants.HEADER_ACTION.equals(key) &&
synCtx.getWSAAction() != null) {
- return synCtx.getWSAAction();
- } else if (Constants.HEADER_FAULT.equals(key) &&
synCtx.getFaultTo() != null) {
- return synCtx.getFaultTo().getAddress();
- } else if (Constants.HEADER_REPLY_TO.equals(key) &&
synCtx.getReplyTo() != null) {
- return synCtx.getReplyTo().getAddress();
+ Object result = synCtx.getProperty(key);
+ if (result != null) {
+ return result;
+ } else {
+ return synCtx.getEntry(key);
}
}
- return synCtx.getEntry(key);
} else if (Constants.SCOPE_AXIS2.equals(scope) && synCtx instanceof
Axis2MessageContext) {
org.apache.axis2.context.MessageContext axis2MessageContext
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
