You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by sa...@apache.org on 2006/06/01 09:09:35 UTC
svn commit: r410777 - in
/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse:
Constants.java core/axis2/Axis2FlexibleMEPClient.java
core/axis2/Axis2Sender.java
Author: saminda
Date: Thu Jun 1 00:09:33 2006
New Revision: 410777
URL: http://svn.apache.org/viewvc?rev=410777&view=rev
Log:
Cleaning up the <send/> mediator code.
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/Constants.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2Sender.java
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/Constants.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/Constants.java?rev=410777&r1=410776&r2=410777&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/Constants.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/Constants.java Thu Jun 1 00:09:33 2006
@@ -52,10 +52,4 @@
// for security supporting
String SECURITY_QOS = "synapse_security";
- String ADDRESSING_PROCESSED_CONFIGURATION_CONTEXT = "addressing_processed_configurationContext";
-
- // addressing properites handling
- String ENGAGE_ADDRESSING_IN_MESSAGE = "__ENGAGE_ADDRESSING_IN_MESSAGE__";
-
- String ENGAGE_ADDRESSING_OUT_BOUND_MESSAGE = "__ENGAGE_ADDRESSING_OUT_BOUND_MESSAGE__";
}
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java?rev=410777&r1=410776&r2=410777&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java Thu Jun 1 00:09:33 2006
@@ -123,31 +123,20 @@
+ UUIDGenerator.getUUID()));
if (axisMsgCtx.getReplyTo() != null)
mc.setReplyTo(axisMsgCtx.getReplyTo());
- //if (axisMsgCtx.getRelatesTo() != null)
- //mc.setRelatesTo(axisMsgCtx.getRelatesTo());
- if (axisMsgCtx.getTo() != null) {
- mc.setTo(axisMsgCtx.getTo());
- } else {
- throw new AxisFault(
+ if (axisMsgCtx.getRelationships() != null)
+ mc.setRelationships(axisMsgCtx.getRelationships());
+ if (axisMsgCtx.getTo() != null) {
+ mc.setTo(axisMsgCtx.getTo());
+ } else {
+ throw new AxisFault(
"To canno't be null, if null Synapse can't infer the transport");
- }
+ }
if (axisMsgCtx.isDoingREST()) {
mc.setDoingREST(true);
}
- // handling the outbound message with addressing
- AxisModule module = ac.getModule(new QName(org.apache.axis2.Constants.MODULE_ADDRESSING));
- if ((axisMsgCtx.getProperty(Constants.ENGAGE_ADDRESSING_IN_MESSAGE) != null) ||
- (axisMsgCtx.getProperty(
- Constants.ENGAGE_ADDRESSING_OUT_BOUND_MESSAGE) != null)) {
- if (!ac.getService("__ANONYMOUS_SERVICE__")
- .isEngaged(module.getName())) {
- ac.getService("__ANONYMOUS_SERVICE__").engageModule(module, ac);
- }
- }
-
- //TODO; following line needed to be removed
-
+ // This has to be set due to addressing hadndelers will ignore the values if its set
+ // in infoset.
mc.setEnvelope(outEnvelopeConfiguration(axisMsgCtx));
AxisOperation axisAnonymousOperation =
@@ -172,12 +161,7 @@
// variable
response.setDoingREST(axisMsgCtx.isDoingREST());
response.setProperty(Constants.ISRESPONSE_PROPERTY, Boolean.TRUE);
-
- if (ac.getService("__ANONYMOUS_SERVICE__")
- .isEngaged(module.getName())) {
- ac.getService("__ANONYMOUS_SERVICE__")
- .disEngageModule(ac.getModule(module.getName()));
- }
+
return response;
}
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2Sender.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2Sender.java?rev=410777&r1=410776&r2=410777&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2Sender.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2Sender.java Thu Jun 1 00:09:33 2006
@@ -22,7 +22,6 @@
import org.apache.synapse.Constants;
import org.apache.synapse.SynapseException;
-import java.util.Set;
import java.util.Iterator;
/**
@@ -30,57 +29,54 @@
*/
public class Axis2Sender {
- public static void sendOn(org.apache.synapse.MessageContext synapseInMessageContext) {
+ public static void sendOn(
+ org.apache.synapse.MessageContext synapseInMessageContext) {
try {
- MessageContext axis2MessageContext = ((Axis2MessageContext) synapseInMessageContext).getAxis2MessageContext();
- // At any time any QOS is disengaged. It's engaged iff, a flag is
- // set in execution chain. ex: addressing will be engage in outpath iff ADDRESSING_PROCESSED is set.
+ MessageContext axis2MessageContext =
+ ((Axis2MessageContext) synapseInMessageContext)
+ .getAxis2MessageContext();
- if (synapseInMessageContext.getProperty(Constants.ENGAGE_ADDRESSING_IN_MESSAGE) != null) {
- axis2MessageContext.setProperty(Constants.ENGAGE_ADDRESSING_IN_MESSAGE, Boolean.TRUE);
- }
-
- //Now handle the outbound message with addressing
- if (synapseInMessageContext.getProperty(Constants.ENGAGE_ADDRESSING_OUT_BOUND_MESSAGE) != null) {
- axis2MessageContext.setProperty(Constants.ENGAGE_ADDRESSING_OUT_BOUND_MESSAGE, Boolean.TRUE);
- }
- MessageContext axisOutMsgContext = Axis2FlexibleMEPClient.send(axis2MessageContext);
+ MessageContext axisOutMsgContext =
+ Axis2FlexibleMEPClient.send(axis2MessageContext);
// run all rules on response
synapseInMessageContext.setResponse(true);
axisOutMsgContext.setServerSide(true);
axisOutMsgContext.setProperty(
- MessageContext.TRANSPORT_OUT,
- axis2MessageContext.getProperty(MessageContext.TRANSPORT_OUT));
+ MessageContext.TRANSPORT_OUT,
+ axis2MessageContext.getProperty(
+ MessageContext.TRANSPORT_OUT));
axisOutMsgContext.setTransportIn(
- axis2MessageContext.getTransportIn());
+ axis2MessageContext.getTransportIn());
// create the synapse message context for the response
org.apache.synapse.MessageContext synapseOutMessageContext =
- new Axis2MessageContext(
- axisOutMsgContext,
- synapseInMessageContext.getConfiguration(),
- synapseInMessageContext.getEnvironment());
+ new Axis2MessageContext(
+ axisOutMsgContext,
+ synapseInMessageContext.getConfiguration(),
+ synapseInMessageContext.getEnvironment());
// now set properties to co-relate to the request i.e. copy over
// correlate/* messgae properties from original message to response received
- Iterator iter = synapseInMessageContext.getPropertyKeySet().iterator();
+ Iterator iter =
+ synapseInMessageContext.getPropertyKeySet().iterator();
while (iter.hasNext()) {
Object key = iter.next();
- if (key instanceof String && ((String)key).startsWith(Constants.CORRELATE)) {
+ if (key instanceof String &&
+ ((String) key).startsWith(Constants.CORRELATE)) {
synapseOutMessageContext.setProperty(
- (String) key,
- synapseInMessageContext.getProperty((String) key)
+ (String) key,
+ synapseInMessageContext.getProperty((String) key)
);
}
}
-
// send the response message through the synapse mediation flow
- synapseInMessageContext.getEnvironment().injectMessage(synapseOutMessageContext);
+ synapseInMessageContext.getEnvironment()
+ .injectMessage(synapseOutMessageContext);
} catch (Exception e) {
e.printStackTrace();
@@ -90,11 +86,14 @@
public static void sendBack(org.apache.synapse.MessageContext smc) {
- MessageContext messageContext = ((Axis2MessageContext) smc).getAxis2MessageContext();
+ MessageContext messageContext =
+ ((Axis2MessageContext) smc).getAxis2MessageContext();
- AxisEngine ae = new AxisEngine(messageContext.getConfigurationContext());
+ AxisEngine ae =
+ new AxisEngine(messageContext.getConfigurationContext());
try {
- messageContext.setProperty(Constants.ISRESPONSE_PROPERTY, Boolean.TRUE);
+ messageContext
+ .setProperty(Constants.ISRESPONSE_PROPERTY, Boolean.TRUE);
// check for addressing is alredy engaged for this message.
// if engage we should use the address enable Configuraion context.
ae.send(messageContext);
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org