You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by ru...@apache.org on 2007/03/01 08:34:25 UTC
svn commit: r513212 - in /webservices/synapse/trunk/java/modules:
core/src/main/java/org/apache/synapse/
core/src/main/java/org/apache/synapse/config/xml/
core/src/main/java/org/apache/synapse/core/axis2/
core/src/main/java/org/apache/synapse/mediators...
Author: ruwan
Date: Wed Feb 28 23:34:23 2007
New Revision: 513212
URL: http://svn.apache.org/viewvc?view=rev&rev=513212
Log:
removing the corelate properties in synapse
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SynapseMediator.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMessageContext.java
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ThreadLocalMessageContext.java
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java?view=diff&rev=513212&r1=513211&r2=513212
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java Wed Feb 28 23:34:23 2007
@@ -74,13 +74,6 @@
public Object getProperty(String key);
/**
- * Get the value of a correlation property set on the message instance
- * @param key key to look up property
- * @return value for the given key
- */
- public Object getCorrelationProperty(String key);
-
- /**
* Set a custom (local) property with the given name on the message instance
* @param key key to be used
* @param value value to be saved
@@ -88,24 +81,10 @@
public void setProperty(String key, Object value);
/**
- * Set a local message property with the given name and value, and copy it over
- * to any corresponding response messages for correlation
- * @param key key to be used
- * @param value value to be saved
- */
- public void setCorrelationProperty(String key, Object value);
-
- /**
* Returns the Set of keys over the properties on this message context
* @return a Set of keys over message properties
*/
public Set getPropertyKeySet();
-
- /**
- * Returns the Set of keys that should be correlated to a response
- * @return a Set of keys that should be correlated with the response
- */
- public Set getCorrelationPropertyKeySet();
/**
* Get the SOAP envelope of this message
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java?view=diff&rev=513212&r1=513211&r2=513212
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java Wed Feb 28 23:34:23 2007
@@ -39,7 +39,7 @@
* <p/>
* <proxy-service name="string" [transports="(http |https |jms )+|all"]>
* <description>..</description>?
- * <target [inSequence="name"] [outSequence="name"] [faultSequence="name"] [endpoint="name"]>
+ * <target [inSequence="name"] [outSequence="name"] [faultSequence="name"] [endpoint="name"]> // todo: do we realy need this
* <endpoint>...</endpoint>
* <inSequence>...</inSequence>
* <outSequence>...</outSequence>
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java?view=diff&rev=513212&r1=513211&r2=513212
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java Wed Feb 28 23:34:23 2007
@@ -76,6 +76,7 @@
}
return seqMediator;
}
+
public Mediator createMediator(OMElement elem) {
SequenceMediator seqMediator = new SequenceMediator();
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java?view=diff&rev=513212&r1=513211&r2=513212
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AsyncCallback.java Wed Feb 28 23:34:23 2007
@@ -80,20 +80,13 @@
synapseInMessageContext.setResponse(true);
synapseInMessageContext.setTo(null);
- // now set properties to co-relate to the request i.e. copy over
- // correlation messgae properties from original message to response received
- Iterator iter = synapseOutMsgCtx.getCorrelationPropertyKeySet().iterator();
+ // set the properties of the original MC to the new MC
+ Iterator iter = synapseOutMsgCtx.getPropertyKeySet().iterator();
while (iter.hasNext()) {
Object key = iter.next();
synapseInMessageContext.setProperty(
- (String) key, synapseOutMsgCtx.getCorrelationProperty((String) key));
- }
-
- // sets the out sequence if present to the in MC to mediate the response
- if(synapseOutMsgCtx.getProperty(Constants.PROXY_SERVICE) != null) {
- synapseInMessageContext.setProperty(Constants.PROXY_SERVICE,
- synapseOutMsgCtx.getProperty(Constants.PROXY_SERVICE));
+ (String) key, synapseOutMsgCtx.getProperty((String) key));
}
// send the response message through the synapse mediation flow
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java?view=diff&rev=513212&r1=513211&r2=513212
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java Wed Feb 28 23:34:23 2007
@@ -48,7 +48,6 @@
private SynapseConfiguration cfg = null;
private SynapseEnvironment env = null;
private Map properties = new HashMap();
- private Map correlationProperties = new HashMap();
/** The Axis2 MessageContext reference */
private org.apache.axis2.context.MessageContext axis2MessageContext = null;
@@ -79,8 +78,6 @@
Object ret = properties.get(key);
if (ret != null) {
return ret;
- } else if (correlationProperties.get(key) != null) {
- return correlationProperties.get(key);
} else if (getConfiguration() != null) {
return getConfiguration().getProperty(key);
} else {
@@ -88,24 +85,12 @@
}
}
- public Object getCorrelationProperty(String key) {
- return correlationProperties.get(key);
- }
-
public void setProperty(String key, Object value) {
properties.put(key, value);
}
- public void setCorrelationProperty(String key, Object value) {
- correlationProperties.put(key, value);
- }
-
public Set getPropertyKeySet() {
return properties.keySet();
- }
-
- public Set getCorrelationPropertyKeySet() {
- return correlationProperties.keySet();
}
//--------------------
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java?view=diff&rev=513212&r1=513211&r2=513212
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java Wed Feb 28 23:34:23 2007
@@ -68,7 +68,7 @@
boolean isFault = synCtx.getEnvelope().getBody().hasFault();
proxyServiceStatisticsStack.put(
name, System.currentTimeMillis(), !synCtx.isResponse(), statisticsEnable, isFault);
- synCtx.setCorrelationProperty(
+ synCtx.setProperty(
org.apache.synapse.Constants.PROXYSERVICE_STATISTICS_STACK, proxyServiceStatisticsStack);
}
@@ -80,7 +80,7 @@
log.debug("Using the sequence named " + proxy.getTargetInSequence() + " for message mediation");
inSequence.mediate(synCtx);
} else {
- // todo: what can we do ?????? throw an AxisFault
+ // todo: what can we do ?????? throw an AxisFault / mediate using the fault sequence
log.error("Unable to find the in sequence for the proxy service " +
"specified by the name " + proxy.getTargetInSequence() + " - [Message dropped]");
}
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java?view=diff&rev=513212&r1=513211&r2=513212
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java Wed Feb 28 23:34:23 2007
@@ -50,7 +50,7 @@
StatisticsStack synapseServiceStack = (StatisticsStack) synCtx.getProperty(org.apache.synapse.Constants.SYNAPSESERVICE_STATISTICS_STACK);
if (synapseServiceStack== null) {
synapseServiceStack= new ProxyServiceStatisticsStack();
- synCtx.setCorrelationProperty(org.apache.synapse.Constants.SYNAPSESERVICE_STATISTICS_STACK, synapseServiceStack);
+ synCtx.setProperty(org.apache.synapse.Constants.SYNAPSESERVICE_STATISTICS_STACK, synapseServiceStack);
}
String name = "SynapseService";
boolean isFault =synCtx.getEnvelope().getBody().hasFault();
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SynapseMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SynapseMediator.java?view=diff&rev=513212&r1=513211&r2=513212
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SynapseMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SynapseMediator.java Wed Feb 28 23:34:23 2007
@@ -56,7 +56,7 @@
StatisticsStack sequenceStack = (StatisticsStack) synCtx.getProperty(Constants.SEQUENCE_STATISTICS_STACK);
if (sequenceStack == null) {
sequenceStack = new SequenceStatisticsStack();
- synCtx.setCorrelationProperty(Constants.SEQUENCE_STATISTICS_STACK, sequenceStack);
+ synCtx.setProperty(Constants.SEQUENCE_STATISTICS_STACK, sequenceStack);
}
String seqName = "MainSequence";
boolean isFault = synCtx.getEnvelope().getBody().hasFault();
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java?view=diff&rev=513212&r1=513211&r2=513212
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java Wed Feb 28 23:34:23 2007
@@ -69,7 +69,7 @@
smc.setProperty(getName(), value);
} else if(Constants.SCOPE_CORRELATE.equals(getScope())) {
- smc.setCorrelationProperty(getName(), value);
+ smc.setProperty(getName(), value);
} else if (Constants.SCOPE_AXIS2.equals(getScope()) && smc instanceof Axis2MessageContext) {
Axis2MessageContext axis2smc = (Axis2MessageContext) smc;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java?view=diff&rev=513212&r1=513211&r2=513212
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java Wed Feb 28 23:34:23 2007
@@ -98,7 +98,7 @@
EndPointStatisticsStack endPointStatisticsStack = new EndPointStatisticsStack();
boolean isFault =synCtx.getEnvelope().getBody().hasFault();
endPointStatisticsStack.put(endPointName, System.currentTimeMillis(), !synCtx.isResponse(), statisticsEnable,isFault);
- synCtx.setCorrelationProperty(org.apache.synapse.Constants.ENDPOINT_STATISTICS_STACK, endPointStatisticsStack);
+ synCtx.setProperty(org.apache.synapse.Constants.ENDPOINT_STATISTICS_STACK, endPointStatisticsStack);
}
synCtx.setTo(new EndpointReference(eprAddress));
Modified: webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java?view=diff&rev=513212&r1=513211&r2=513212
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java Wed Feb 28 23:34:23 2007
@@ -41,16 +41,6 @@
SOAPEnvelope envelope = null;
private EndpointReference to = null;
-
- private Map correlationProperties = new HashMap();
-
- public void setCorrelationProperty(String key, Object value) {
- correlationProperties.put(key, value);
- }
-
- public Set getCorrelationPropertyKeySet() {
- return correlationProperties.keySet();
- }
public SynapseConfiguration getConfiguration() {
return synCfg;
@@ -76,10 +66,6 @@
} else {
return null;
}
- }
-
- public Object getCorrelationProperty(String key) {
- return correlationProperties.get(key);
}
public void setProperty(String key, Object value) {
Modified: webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMessageContext.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMessageContext.java?view=diff&rev=513212&r1=513211&r2=513212
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMessageContext.java (original)
+++ webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMessageContext.java Wed Feb 28 23:34:23 2007
@@ -107,11 +107,7 @@
}
public Object getProperty(String key) {
- return mc.getConfiguration();
- }
-
- public Object getCorrelationProperty(String key) {
- return mc.getCorrelationProperty(key);
+ return mc.getProperty(key);
}
public void setProperty(String key, Object value) {
@@ -120,14 +116,6 @@
public Set getPropertyKeySet() {
return mc.getPropertyKeySet();
- }
-
- public void setCorrelationProperty(String key, Object value) {
- mc.setCorrelationProperty(key, value);
- }
-
- public Set getCorrelationPropertyKeySet() {
- return mc.getCorrelationPropertyKeySet();
}
public SOAPEnvelope getEnvelope() {
Modified: webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ThreadLocalMessageContext.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ThreadLocalMessageContext.java?view=diff&rev=513212&r1=513211&r2=513212
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ThreadLocalMessageContext.java (original)
+++ webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ThreadLocalMessageContext.java Wed Feb 28 23:34:23 2007
@@ -113,10 +113,6 @@
return getMC().getProperty(key);
}
- public Object getCorrelationProperty(String key) {
- return getMC().getCorrelationProperty(key);
- }
-
public Set getPropertyKeySet() {
return getMC().getPropertyKeySet();
}
@@ -219,14 +215,6 @@
public void setProperty(String key, Object value) {
getMC().setProperty(key, value);
- }
-
- public void setCorrelationProperty(String key, Object value) {
- getMC().setCorrelationProperty(key, value);
- }
-
- public Set getCorrelationPropertyKeySet() {
- return getMC().getCorrelationPropertyKeySet();
}
public void setRelatesTo(RelatesTo[] reference) {
Modified: webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java?view=diff&rev=513212&r1=513211&r2=513212
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java (original)
+++ webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java Wed Feb 28 23:34:23 2007
@@ -42,16 +42,6 @@
private EndpointReference to = null;
- private Map correlationProperties = new HashMap();
-
- public void setCorrelationProperty(String key, Object value) {
- correlationProperties.put(key, value);
- }
-
- public Set getCorrelationPropertyKeySet() {
- return correlationProperties.keySet();
- }
-
public SynapseConfiguration getConfiguration() {
return synCfg;
}
@@ -76,10 +66,6 @@
} else {
return null;
}
- }
-
- public Object getCorrelationProperty(String key) {
- return correlationProperties.get(key);
}
public void setProperty(String key, Object value) {
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org