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/08 05:09:30 UTC
svn commit: r515911 - in /webservices/synapse/trunk/java/modules:
core/src/main/java/org/apache/synapse/
core/src/main/java/org/apache/synapse/config/
core/src/main/java/org/apache/synapse/config/xml/
core/src/main/java/org/apache/synapse/config/xml/en...
Author: ruwan
Date: Wed Mar 7 20:09:24 2007
New Revision: 515911
URL: http://svn.apache.org/viewvc?view=rev&rev=515911
Log:
Refactored the endpoint package structure and added transactional resource access methods to the Context
Added:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/
- copied from r515542, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AddressEndpoint.java
- copied, changed from r515905, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/AddressEndpoint.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/Endpoint.java
- copied, changed from r515905, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/Endpoint.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/FailoverEndpoint.java
- copied, changed from r515905, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/FailoverEndpoint.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/IndirectEndpoint.java
- copied, changed from r515905, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/IndirectEndpoint.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/LoadbalanceEndpoint.java
- copied, changed from r515905, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/LoadbalanceEndpoint.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
- copied, changed from r515905, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/WSDLEndpoint.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/
- copied from r515910, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/algorithms/
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/LoadbalanceAlgorithm.java
- copied, changed from r515905, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/algorithms/LoadbalanceAlgorithm.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/RoundRobin.java
- copied, changed from r515905, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/algorithms/RoundRobin.java
Removed:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/FailureListener.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/algorithms/
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/
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/SynapseConfiguration.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorFactory.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorSerializer.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationSerializer.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointAbstractSerializer.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointFactory.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointSerializer.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointSerializer.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/LoadbalanceAlgorithmFactory.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/Axis2SynapseEnvironment.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.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/SynapseCallbackReceiver.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/GetPropertyFunction.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.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/send/SendConstants.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/SendMediator.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/AbstractRegistry.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/StatisticsUtils.java
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/TestUtils.java
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/base/SequenceMediatorTest.java
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/PropertyMediatorTest.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
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/TestUtils.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=515911&r1=515910&r2=515911
==============================================================================
--- 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 Mar 7 20:09:24 2007
@@ -26,7 +26,7 @@
import org.apache.axis2.addressing.RelatesTo;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.core.SynapseEnvironment;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
+import org.apache.synapse.endpoints.Endpoint;
import java.util.Set;
import java.util.Stack;
@@ -115,7 +115,7 @@
* @param key key to look up property
* @return value for the given key
*/
- public Object getLocalProperty(String key);
+ public Object getProperty(String key);
/**
* Get the value of a property set on the message instance, from the local registry
@@ -136,7 +136,7 @@
* Returns the Set of keys over the properties on this message context
* @return a Set of keys over message properties
*/
- public Set getLocalPropertyKeySet();
+ public Set getPropertyKeySet();
/**
* Get the SOAP envelope of this message
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java Wed Mar 7 20:09:24 2007
@@ -24,10 +24,9 @@
import org.apache.synapse.SynapseException;
import org.apache.synapse.Mediator;
import org.apache.synapse.Constants;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
+import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.mediators.base.SequenceMediator;
import org.apache.synapse.config.xml.MediatorFactoryFinder;
-import org.apache.synapse.config.xml.endpoints.EndpointAbstractFactory;
import org.apache.synapse.config.xml.endpoints.XMLToEndpointMapper;
import org.apache.synapse.core.axis2.ProxyService;
import org.apache.synapse.registry.Registry;
@@ -86,6 +85,11 @@
localRegistry.put(key, entry);
}
+ /**
+ * Returns the map of defined sequences in the configuraiton excluding the fetched sequences
+ * from remote registry
+ * @return Map of SequenceMediators defined in the local configuraion
+ */
public Map getDefinedSequences() {
Map definedSequences = new HashMap();
Iterator itr = localRegistry.values().iterator();
@@ -165,7 +169,7 @@
* contents (or cached contents if the Entry refers to a dynamic resource off a
* remote registry)
*/
- public void addResource(String key, Entry entry) {
+ public void addEntry(String key, Entry entry) {
if (entry.getType() == Entry.URL_SRC) {
try {
@@ -187,6 +191,23 @@
}
/**
+ * Returns the map of defined entries in the configuraiton excluding the fetched entries
+ * from remote registry
+ * @return Map of Entries defined in the local configuraion
+ */
+ public Map getDefinedEntries() {
+ Map definedEntries = new HashMap();
+ Iterator itr = localRegistry.values().iterator();
+ while(itr.hasNext()) {
+ Object o = itr.next();
+ if(o instanceof Entry && ((Entry) o).getType() != Entry.REMOTE_ENTRY) {
+ definedEntries.put(((Entry) o).getKey(), o);
+ }
+ }
+ return definedEntries;
+ }
+
+ /**
* Get the resource with the given key
* @param key the key of the resource required
* @return its value
@@ -242,6 +263,23 @@
*/
public void addEndpoint(String key, Entry entry) {
localRegistry.put(key, entry);
+ }
+
+ /**
+ * Returns the map of defined endpoints in the configuraiton excluding the fetched endpoints
+ * from remote registry
+ * @return Map of Endpoints defined in the local configuraion
+ */
+ public Map getDefinedEndpoints() {
+ Map definedEndpoints = new HashMap();
+ Iterator itr = localRegistry.values().iterator();
+ while(itr.hasNext()) {
+ Object o = itr.next();
+ if(o instanceof Endpoint) {
+ definedEndpoints.put(((Endpoint) o).getName(), o);
+ }
+ }
+ return definedEndpoints;
}
/**
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java Wed Mar 7 20:09:24 2007
@@ -24,8 +24,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseException;
import org.apache.synapse.mediators.base.SequenceMediator;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
-import org.apache.synapse.config.EndpointDefinition;
+import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.config.xml.endpoints.EndpointAbstractSerializer;
import org.apache.synapse.config.xml.endpoints.EndpointSerializer;
import org.apache.synapse.core.axis2.ProxyService;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorFactory.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorFactory.java Wed Mar 7 20:09:24 2007
@@ -24,16 +24,12 @@
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Mediator;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.config.EndpointDefinition;
import org.apache.synapse.config.xml.endpoints.EndpointFactory;
import org.apache.synapse.config.xml.endpoints.EndpointAbstractFactory;
import org.apache.synapse.mediators.builtin.send.SendMediator;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
+import org.apache.synapse.endpoints.Endpoint;
import javax.xml.namespace.QName;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
/**
* The Send mediator factory parses a Send element and creates an instance of the mediator
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorSerializer.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorSerializer.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorSerializer.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SendMediatorSerializer.java Wed Mar 7 20:09:24 2007
@@ -24,13 +24,10 @@
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseException;
import org.apache.synapse.Mediator;
-import org.apache.synapse.config.EndpointDefinition;
import org.apache.synapse.config.xml.endpoints.EndpointSerializer;
import org.apache.synapse.config.xml.endpoints.EndpointAbstractSerializer;
import org.apache.synapse.mediators.builtin.send.SendMediator;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
-
-import java.util.Iterator;
+import org.apache.synapse.endpoints.Endpoint;
/**
*
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java Wed Mar 7 20:09:24 2007
@@ -31,7 +31,7 @@
import org.apache.synapse.core.axis2.ProxyService;
import org.apache.synapse.mediators.base.SequenceMediator;
import org.apache.synapse.mediators.builtin.send.SendMediator;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
+import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.mediators.builtin.LogMediator;
import javax.xml.namespace.QName;
@@ -129,10 +129,10 @@
if (config.getLocalRegistry().get(entry.getKey()) != null) {
handleException("Duplicate registry entry definition for key : " + entry.getKey());
}
- config.addResource(entry.getKey(), entry);
+ config.addEntry(entry.getKey(), entry);
}
- private static void defineSequence(SynapseConfiguration config, OMElement ele) {
+ public static void defineSequence(SynapseConfiguration config, OMElement ele) {
String name = ele.getAttributeValue(new QName(Constants.NULL_NAMESPACE, "name"));
if (name != null) {
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationSerializer.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationSerializer.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationSerializer.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationSerializer.java Wed Mar 7 20:09:24 2007
@@ -27,10 +27,9 @@
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseException;
import org.apache.synapse.Mediator;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
+import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.config.Entry;
-import org.apache.synapse.config.xml.endpoints.EndpointSerializer;
import org.apache.synapse.config.xml.endpoints.EndpointAbstractSerializer;
import org.apache.synapse.core.axis2.ProxyService;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java Wed Mar 7 20:09:24 2007
@@ -19,8 +19,8 @@
package org.apache.synapse.config.xml.endpoints;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
-import org.apache.synapse.mediators.builtin.send.endpoints.AddressEndpoint;
+import org.apache.synapse.endpoints.Endpoint;
+import org.apache.synapse.endpoints.AddressEndpoint;
import org.apache.synapse.config.EndpointDefinition;
import org.apache.synapse.Constants;
import org.apache.synapse.SynapseException;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java Wed Mar 7 20:09:24 2007
@@ -22,8 +22,8 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
-import org.apache.synapse.mediators.builtin.send.endpoints.AddressEndpoint;
+import org.apache.synapse.endpoints.Endpoint;
+import org.apache.synapse.endpoints.AddressEndpoint;
import org.apache.synapse.SynapseException;
import org.apache.synapse.Constants;
import org.apache.synapse.config.EndpointDefinition;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointAbstractSerializer.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointAbstractSerializer.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointAbstractSerializer.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointAbstractSerializer.java Wed Mar 7 20:09:24 2007
@@ -19,7 +19,7 @@
package org.apache.synapse.config.xml.endpoints;
-import org.apache.synapse.mediators.builtin.send.endpoints.*;
+import org.apache.synapse.endpoints.*;
import org.apache.synapse.SynapseException;
/**
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java Wed Mar 7 20:09:24 2007
@@ -19,7 +19,7 @@
package org.apache.synapse.config.xml.endpoints;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
+import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.config.XMLToObjectMapper;
import org.apache.axiom.om.OMElement;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java Wed Mar 7 20:09:24 2007
@@ -20,7 +20,7 @@
package org.apache.synapse.config.xml.endpoints;
import org.apache.axiom.om.OMElement;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
+import org.apache.synapse.endpoints.Endpoint;
/**
* All endpoint serializers should implement this interface. Use EndpointAbstractSerializer to obtain
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointFactory.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointFactory.java Wed Mar 7 20:09:24 2007
@@ -19,8 +19,8 @@
package org.apache.synapse.config.xml.endpoints;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
-import org.apache.synapse.mediators.builtin.send.endpoints.FailoverEndpoint;
+import org.apache.synapse.endpoints.Endpoint;
+import org.apache.synapse.endpoints.FailoverEndpoint;
import org.apache.synapse.SynapseException;
import org.apache.synapse.Constants;
import org.apache.axiom.om.OMElement;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointSerializer.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointSerializer.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointSerializer.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointSerializer.java Wed Mar 7 20:09:24 2007
@@ -22,8 +22,8 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMFactory;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
-import org.apache.synapse.mediators.builtin.send.endpoints.FailoverEndpoint;
+import org.apache.synapse.endpoints.Endpoint;
+import org.apache.synapse.endpoints.FailoverEndpoint;
import org.apache.synapse.SynapseException;
import org.apache.synapse.Constants;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java Wed Mar 7 20:09:24 2007
@@ -19,8 +19,8 @@
package org.apache.synapse.config.xml.endpoints;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
-import org.apache.synapse.mediators.builtin.send.endpoints.IndirectEndpoint;
+import org.apache.synapse.endpoints.Endpoint;
+import org.apache.synapse.endpoints.IndirectEndpoint;
import org.apache.synapse.SynapseException;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointSerializer.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointSerializer.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointSerializer.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointSerializer.java Wed Mar 7 20:09:24 2007
@@ -22,8 +22,8 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMFactory;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
-import org.apache.synapse.mediators.builtin.send.endpoints.IndirectEndpoint;
+import org.apache.synapse.endpoints.Endpoint;
+import org.apache.synapse.endpoints.IndirectEndpoint;
import org.apache.synapse.SynapseException;
import org.apache.synapse.Constants;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java Wed Mar 7 20:09:24 2007
@@ -19,9 +19,9 @@
package org.apache.synapse.config.xml.endpoints;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
-import org.apache.synapse.mediators.builtin.send.endpoints.LoadbalanceEndpoint;
-import org.apache.synapse.mediators.builtin.send.algorithms.LoadbalanceAlgorithm;
+import org.apache.synapse.endpoints.Endpoint;
+import org.apache.synapse.endpoints.LoadbalanceEndpoint;
+import org.apache.synapse.endpoints.algorithms.LoadbalanceAlgorithm;
import org.apache.synapse.mediators.builtin.send.SendConstants;
import org.apache.synapse.SynapseException;
import org.apache.synapse.Constants;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java Wed Mar 7 20:09:24 2007
@@ -22,10 +22,10 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
-import org.apache.synapse.mediators.builtin.send.endpoints.LoadbalanceEndpoint;
-import org.apache.synapse.mediators.builtin.send.algorithms.LoadbalanceAlgorithm;
-import org.apache.synapse.mediators.builtin.send.algorithms.RoundRobin;
+import org.apache.synapse.endpoints.Endpoint;
+import org.apache.synapse.endpoints.LoadbalanceEndpoint;
+import org.apache.synapse.endpoints.algorithms.LoadbalanceAlgorithm;
+import org.apache.synapse.endpoints.algorithms.RoundRobin;
import org.apache.synapse.SynapseException;
import org.apache.synapse.Constants;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java Wed Mar 7 20:09:24 2007
@@ -19,8 +19,8 @@
package org.apache.synapse.config.xml.endpoints;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
-import org.apache.synapse.mediators.builtin.send.endpoints.WSDLEndpoint;
+import org.apache.synapse.endpoints.Endpoint;
+import org.apache.synapse.endpoints.WSDLEndpoint;
import org.apache.synapse.Constants;
import org.apache.synapse.SynapseException;
import org.apache.synapse.config.EndpointDefinition;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java Wed Mar 7 20:09:24 2007
@@ -22,8 +22,8 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
-import org.apache.synapse.mediators.builtin.send.endpoints.WSDLEndpoint;
+import org.apache.synapse.endpoints.Endpoint;
+import org.apache.synapse.endpoints.WSDLEndpoint;
import org.apache.synapse.SynapseException;
import org.apache.synapse.Constants;
import org.apache.synapse.config.EndpointDefinition;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/LoadbalanceAlgorithmFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/LoadbalanceAlgorithmFactory.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/LoadbalanceAlgorithmFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/LoadbalanceAlgorithmFactory.java Wed Mar 7 20:09:24 2007
@@ -21,8 +21,8 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMAttribute;
-import org.apache.synapse.mediators.builtin.send.algorithms.LoadbalanceAlgorithm;
-import org.apache.synapse.mediators.builtin.send.algorithms.RoundRobin;
+import org.apache.synapse.endpoints.algorithms.LoadbalanceAlgorithm;
+import org.apache.synapse.endpoints.algorithms.RoundRobin;
import org.apache.synapse.mediators.builtin.send.SendConstants;
import javax.xml.namespace.QName;
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=515911&r1=515910&r2=515911
==============================================================================
--- 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 Mar 7 20:09:24 2007
@@ -30,8 +30,9 @@
import org.apache.synapse.*;
import org.apache.synapse.mediators.GetPropertyFunction;
import org.apache.synapse.mediators.MediatorFaultHandler;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
+import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.config.SynapseConfiguration;
+import org.apache.synapse.config.Entry;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -41,39 +42,58 @@
import java.util.*;
+/**
+ * This is the MessageContext implementation that synapse uses almost all the time because Synapse
+ * is implemented on top of the Axis2
+ */
public class Axis2MessageContext implements MessageContext {
private static final Log log = LogFactory.getLog(Axis2MessageContext.class);
- private SynapseConfiguration cfg = null;
- private SynapseEnvironment env = null;
+ /** Holds the reference to the Synapse Message Context */
+ private SynapseConfiguration synCfg = null;
+
+ /** Holds the environment on which synapse operates */
+ private SynapseEnvironment synEnv = null;
+
+ /** Synapse Message Context properties */
private Map properties = new HashMap();
+
+ /**
+ * Local entries fetched from the configuration or from the registry for the transactional
+ * resource access
+ */
private Map localEntries = new HashMap();
+
+ /** Fault Handler stack which will be popped and called the handleFault in error states */
private Stack faultStack = new Stack();
/** The Axis2 MessageContext reference */
private org.apache.axis2.context.MessageContext axis2MessageContext = null;
+ /** Attribute of the MC specifying whether this is a response or not */
private boolean response = false;
+ /** Attribute specifying whether this MC corresponds to fault response or not */
private boolean faultResponse = false;
+ /** Attribute of MC stating the tracing state of the message */
private int tracingState = Constants.TRACING_UNSET;
public SynapseConfiguration getConfiguration() {
- return cfg;
+ return synCfg;
}
- public void setConfiguration(SynapseConfiguration cfg) {
- this.cfg = cfg;
+ public void setConfiguration(SynapseConfiguration synCfg) {
+ this.synCfg = synCfg;
}
public SynapseEnvironment getEnvironment() {
- return env;
+ return synEnv;
}
- public void setEnvironment(SynapseEnvironment env) {
- this.env = env;
+ public void setEnvironment(SynapseEnvironment synEnv) {
+ this.synEnv = synEnv;
}
public Mediator getMainSequence() {
@@ -120,35 +140,41 @@
}
}
- public Object getLocalProperty(String key) {
- return properties.get(key);
- }
-
public Object getEntry(String key) {
- Object ret = properties.get(key);
- if (ret != null) {
- return ret;
- } else if (getConfiguration() != null) {
- return getConfiguration().getEntry(key);
+ Object o = localEntries.get(key);
+ if (o != null && o instanceof Entry) {
+ return ((Entry) o).getValue();
} else {
- return null;
+ Object e = getConfiguration().getEntry(key);
+ localEntries.put(key, e);
+ return e;
}
}
+ public Object getProperty(String key) {
+ return properties.get(key);
+ }
+
public void setProperty(String key, Object value) {
properties.put(key, value);
}
- public Set getLocalPropertyKeySet() {
+ public Set getPropertyKeySet() {
return properties.keySet();
}
- //--------------------
+ /**
+ * Constructor for the Axis2MessageContext inside Synapse
+ *
+ * @param axisMsgCtx MessageContext representing the relevant Axis MC
+ * @param synCfg SynapseConfiguraion describing Synapse
+ * @param synEnv SynapseEnvironment describing the environment of Synapse
+ */
public Axis2MessageContext(org.apache.axis2.context.MessageContext axisMsgCtx,
SynapseConfiguration synCfg, SynapseEnvironment synEnv) {
setAxis2MessageContext(axisMsgCtx);
- cfg = synCfg;
- env = synEnv;
+ this.synCfg = synCfg;
+ this.synEnv = synEnv;
this.pushFault(new MediatorFaultHandler(synCfg.getFaultSequence()));
}
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java Wed Mar 7 20:09:24 2007
@@ -63,34 +63,34 @@
}
// if this is a response to a proxy service
- if (synCtx.getLocalProperty(Constants.PROXY_SERVICE) != null) {
+ if (synCtx.getProperty(Constants.PROXY_SERVICE) != null) {
- if (synCtx.getConfiguration().getProxyService((String) synCtx.getLocalProperty(Constants.PROXY_SERVICE))
+ if (synCtx.getConfiguration().getProxyService((String) synCtx.getProperty(Constants.PROXY_SERVICE))
.getTargetOutSequence() != null) {
String sequenceName = synCtx.getConfiguration().getProxyService(
- (String) synCtx.getLocalProperty(Constants.PROXY_SERVICE)).getTargetOutSequence();
+ (String) synCtx.getProperty(Constants.PROXY_SERVICE)).getTargetOutSequence();
Mediator outSequence = synCtx.getSequence(sequenceName);
if (outSequence != null) {
log.debug("Using the sequence named " + sequenceName + " for the outgoing message mediation of " +
- "the proxy service " + synCtx.getLocalProperty(Constants.PROXY_SERVICE));
+ "the proxy service " + synCtx.getProperty(Constants.PROXY_SERVICE));
outSequence.mediate(synCtx);
} else {
log.error("Unable to find the sequence specified by the name " + sequenceName);
// TODO invoke a generic synapse error handler for this message
}
- } else if (synCtx.getConfiguration().getProxyService((String) synCtx.getLocalProperty(
+ } else if (synCtx.getConfiguration().getProxyService((String) synCtx.getProperty(
Constants.PROXY_SERVICE)).getTargetInLineOutSequence() != null) {
log.debug("Using the anonymous out sequence specified in the proxy service "
- + synCtx.getLocalProperty(Constants.PROXY_SERVICE) + " for out going message mediation");
- synCtx.getConfiguration().getProxyService((String) synCtx.getLocalProperty(
+ + synCtx.getProperty(Constants.PROXY_SERVICE) + " for out going message mediation");
+ synCtx.getConfiguration().getProxyService((String) synCtx.getProperty(
Constants.PROXY_SERVICE)).getTargetInLineOutSequence().mediate(synCtx);
} else {
- log.debug("Proxy service " + synCtx.getLocalProperty(Constants.PROXY_SERVICE) + " does not specifies " +
+ log.debug("Proxy service " + synCtx.getProperty(Constants.PROXY_SERVICE) + " does not specifies " +
"an out sequence - sending the response back");
Axis2Sender.sendBack(synCtx);
}
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java Wed Mar 7 20:09:24 2007
@@ -33,10 +33,9 @@
import org.apache.synapse.Constants;
import org.apache.synapse.SynapseException;
import org.apache.synapse.mediators.base.SequenceMediator;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
+import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.config.Util;
-import org.apache.synapse.config.EndpointDefinition;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
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=515911&r1=515910&r2=515911
==============================================================================
--- 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 Mar 7 20:09:24 2007
@@ -20,7 +20,6 @@
package org.apache.synapse.core.axis2;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.EndpointReference;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Mediator;
@@ -28,9 +27,8 @@
import org.apache.synapse.SynapseException;
import org.apache.synapse.FaultHandler;
import org.apache.synapse.mediators.MediatorFaultHandler;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
+import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.statistics.impl.ProxyServiceStatisticsStack;
-import org.apache.synapse.config.EndpointDefinition;
/**
* This is the MessageReceiver set to act on behalf of Proxy services.
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java Wed Mar 7 20:09:24 2007
@@ -123,12 +123,12 @@
synapseInMessageContext.setTo(null);
// set the properties of the original MC to the new MC
- Iterator iter = synapseOutMsgCtx.getLocalPropertyKeySet().iterator();
+ Iterator iter = synapseOutMsgCtx.getPropertyKeySet().iterator();
while (iter.hasNext()) {
Object key = iter.next();
synapseInMessageContext.setProperty(
- (String) key, synapseOutMsgCtx.getLocalProperty((String) key));
+ (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/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=515911&r1=515910&r2=515911
==============================================================================
--- 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 Mar 7 20:09:24 2007
@@ -50,7 +50,7 @@
MessageContext synCtx = MessageContextCreatorForAxis2.getSynapseMessageContext(mc);
try {
- StatisticsStack synapseServiceStack = (StatisticsStack) synCtx.getLocalProperty(org.apache.synapse.Constants.SYNAPSESERVICE_STATISTICS_STACK);
+ StatisticsStack synapseServiceStack = (StatisticsStack) synCtx.getProperty(org.apache.synapse.Constants.SYNAPSESERVICE_STATISTICS_STACK);
if (synapseServiceStack == null) {
synapseServiceStack = new ProxyServiceStatisticsStack();
synCtx.setProperty(org.apache.synapse.Constants.SYNAPSESERVICE_STATISTICS_STACK, synapseServiceStack);
Copied: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AddressEndpoint.java (from r515905, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/AddressEndpoint.java)
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AddressEndpoint.java?view=diff&rev=515911&p1=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/AddressEndpoint.java&r1=515905&p2=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AddressEndpoint.java&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/AddressEndpoint.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AddressEndpoint.java Wed Mar 7 20:09:24 2007
@@ -17,12 +17,13 @@
* under the License.
*/
-package org.apache.synapse.mediators.builtin.send.endpoints;
+package org.apache.synapse.endpoints;
import org.apache.synapse.MessageContext;
import org.apache.synapse.Constants;
import org.apache.synapse.FaultHandler;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.statistics.impl.EndPointStatisticsStack;
import org.apache.synapse.config.EndpointDefinition;
import org.apache.axis2.addressing.EndpointReference;
Copied: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/Endpoint.java (from r515905, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/Endpoint.java)
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/Endpoint.java?view=diff&rev=515911&p1=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/Endpoint.java&r1=515905&p2=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/Endpoint.java&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/Endpoint.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/Endpoint.java Wed Mar 7 20:09:24 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.synapse.mediators.builtin.send.endpoints;
+package org.apache.synapse.endpoints;
import org.apache.synapse.MessageContext;
Copied: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/FailoverEndpoint.java (from r515905, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/FailoverEndpoint.java)
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/FailoverEndpoint.java?view=diff&rev=515911&p1=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/FailoverEndpoint.java&r1=515905&p2=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/FailoverEndpoint.java&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/FailoverEndpoint.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/FailoverEndpoint.java Wed Mar 7 20:09:24 2007
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.synapse.mediators.builtin.send.endpoints;
+package org.apache.synapse.endpoints;
-import org.apache.synapse.MessageContext;
import org.apache.synapse.FaultHandler;
+import org.apache.synapse.MessageContext;
import java.util.ArrayList;
@@ -85,7 +85,7 @@
public void setActive(boolean active) {
this.active = active;
- }
+ }
public ArrayList getEndpoints() {
return endpoints;
Copied: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/IndirectEndpoint.java (from r515905, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/IndirectEndpoint.java)
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/IndirectEndpoint.java?view=diff&rev=515911&p1=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/IndirectEndpoint.java&r1=515905&p2=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/IndirectEndpoint.java&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/IndirectEndpoint.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/IndirectEndpoint.java Wed Mar 7 20:09:24 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.synapse.mediators.builtin.send.endpoints;
+package org.apache.synapse.endpoints;
import org.apache.synapse.MessageContext;
Copied: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/LoadbalanceEndpoint.java (from r515905, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/LoadbalanceEndpoint.java)
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/LoadbalanceEndpoint.java?view=diff&rev=515911&p1=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/LoadbalanceEndpoint.java&r1=515905&p2=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/LoadbalanceEndpoint.java&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/LoadbalanceEndpoint.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/LoadbalanceEndpoint.java Wed Mar 7 20:09:24 2007
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.synapse.mediators.builtin.send.endpoints;
+package org.apache.synapse.endpoints;
-import org.apache.synapse.MessageContext;
import org.apache.synapse.FaultHandler;
-import org.apache.synapse.mediators.builtin.send.algorithms.LoadbalanceAlgorithm;
+import org.apache.synapse.MessageContext;
+import org.apache.synapse.endpoints.algorithms.LoadbalanceAlgorithm;
import java.util.ArrayList;
@@ -122,6 +122,6 @@
public void onChildEndpointFail(Endpoint endpoint, MessageContext synMessageContext) {
endpoint.setActive(false);
- send(synMessageContext);
+ send(synMessageContext);
}
}
Copied: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java (from r515905, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/WSDLEndpoint.java)
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java?view=diff&rev=515911&p1=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/WSDLEndpoint.java&r1=515905&p2=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/endpoints/WSDLEndpoint.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java Wed Mar 7 20:09:24 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.synapse.mediators.builtin.send.endpoints;
+package org.apache.synapse.endpoints;
import org.apache.synapse.MessageContext;
import org.apache.synapse.config.EndpointDefinition;
Copied: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/LoadbalanceAlgorithm.java (from r515905, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/algorithms/LoadbalanceAlgorithm.java)
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/LoadbalanceAlgorithm.java?view=diff&rev=515911&p1=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/algorithms/LoadbalanceAlgorithm.java&r1=515905&p2=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/LoadbalanceAlgorithm.java&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/algorithms/LoadbalanceAlgorithm.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/LoadbalanceAlgorithm.java Wed Mar 7 20:09:24 2007
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.synapse.mediators.builtin.send.algorithms;
+package org.apache.synapse.endpoints.algorithms;
import org.apache.synapse.MessageContext;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
+import org.apache.synapse.endpoints.Endpoint;
/**
* All load balance algorithms must implement this interface. Implementations of this interface can
Copied: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/RoundRobin.java (from r515905, webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/algorithms/RoundRobin.java)
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/RoundRobin.java?view=diff&rev=515911&p1=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/algorithms/RoundRobin.java&r1=515905&p2=webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/RoundRobin.java&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/algorithms/RoundRobin.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/RoundRobin.java Wed Mar 7 20:09:24 2007
@@ -17,11 +17,10 @@
* under the License.
*/
-package org.apache.synapse.mediators.builtin.send.algorithms;
+package org.apache.synapse.endpoints.algorithms;
import org.apache.synapse.MessageContext;
-import org.apache.synapse.SynapseException;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
+import org.apache.synapse.endpoints.Endpoint;
import java.util.ArrayList;
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=515911&r1=515910&r2=515911
==============================================================================
--- 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 Wed Mar 7 20:09:24 2007
@@ -104,7 +104,7 @@
return null;
}
if (Constants.SCOPE_DEFAULT.equals(scope)) {
- Object result = synCtx.getLocalProperty(key);
+ Object result = synCtx.getProperty(key);
if (result != null) {
return result;
} else {
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java Wed Mar 7 20:09:24 2007
@@ -73,7 +73,7 @@
// Setting Required property to collect the sequence statistics
boolean isStatisticsEnable = (org.apache.synapse.Constants.STATISTICS_ON == statisticsEnable);
if (isStatisticsEnable) {
- StatisticsStack sequenceStack = (StatisticsStack) synCtx.getLocalProperty(Constants.SEQUENCE_STATISTICS_STACK);
+ StatisticsStack sequenceStack = (StatisticsStack) synCtx.getProperty(Constants.SEQUENCE_STATISTICS_STACK);
if (sequenceStack == null) {
sequenceStack = new SequenceStatisticsStack();
synCtx.setProperty(Constants.SEQUENCE_STATISTICS_STACK, sequenceStack);
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=515911&r1=515910&r2=515911
==============================================================================
--- 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 Mar 7 20:09:24 2007
@@ -53,7 +53,7 @@
if(synCtx.isResponse()) {
StatisticsUtils.processAllSequenceStatistics(synCtx);
}
- StatisticsStack sequenceStack = (StatisticsStack) synCtx.getLocalProperty(Constants.SEQUENCE_STATISTICS_STACK);
+ StatisticsStack sequenceStack = (StatisticsStack) synCtx.getProperty(Constants.SEQUENCE_STATISTICS_STACK);
if (sequenceStack == null) {
sequenceStack = new SequenceStatisticsStack();
synCtx.setProperty(Constants.SEQUENCE_STATISTICS_STACK, sequenceStack);
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=515911&r1=515910&r2=515911
==============================================================================
--- 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 Mar 7 20:09:24 2007
@@ -125,13 +125,13 @@
" (scope:" + (scope == null ? "default" : scope) + ")");
if (scope == null) {
//Removing property from the Synapse Context
- Set pros = smc.getLocalPropertyKeySet();
+ Set pros = smc.getPropertyKeySet();
if (pros != null) {
pros.remove(name);
}
} else if (Constants.SCOPE_DEFAULT.equals(scope)) {
//Removing property from the Synapse Context
- Set pros = smc.getLocalPropertyKeySet();
+ Set pros = smc.getPropertyKeySet();
if (pros != null) {
pros.remove(name);
}
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/SendConstants.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/SendConstants.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/SendConstants.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/SendConstants.java Wed Mar 7 20:09:24 2007
@@ -26,7 +26,7 @@
*/
public class SendConstants {
- public static final String ESBSEND_ELEMENT = "send";
+ public static final String SEND_ELEMENT = "send";
public static final String LOADBALANCE_ELEMENT = "loadbalance";
public static final String FAILOVER_ELEMENT = "failover"; // failover only element
public static final String RETRY_AFTER_FAILURE_TIME = "retryAfterFailure";
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/SendMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/SendMediator.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/SendMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/send/SendMediator.java Wed Mar 7 20:09:24 2007
@@ -23,7 +23,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Constants;
import org.apache.synapse.MessageContext;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
+import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.mediators.AbstractMediator;
/**
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/AbstractRegistry.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/AbstractRegistry.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/AbstractRegistry.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/AbstractRegistry.java Wed Mar 7 20:09:24 2007
@@ -25,7 +25,7 @@
import org.apache.synapse.config.XMLToObjectMapper;
import org.apache.synapse.config.Entry;
import org.apache.synapse.mediators.base.SequenceMediator;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
+import org.apache.synapse.endpoints.Endpoint;
import java.net.URI;
import java.util.HashMap;
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/StatisticsUtils.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/StatisticsUtils.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/StatisticsUtils.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/StatisticsUtils.java Wed Mar 7 20:09:24 2007
@@ -38,11 +38,11 @@
StatisticsCollector statisticsCollector = getStatisticsCollector(synCtx);
boolean isFault = synCtx.getEnvelope().getBody().hasFault();
- ProxyServiceStatisticsStack proxyServiceStatisticsStack = (ProxyServiceStatisticsStack) synCtx.getLocalProperty(Constants.PROXYSERVICE_STATISTICS_STACK);
+ ProxyServiceStatisticsStack proxyServiceStatisticsStack = (ProxyServiceStatisticsStack) synCtx.getProperty(Constants.PROXYSERVICE_STATISTICS_STACK);
if (proxyServiceStatisticsStack != null) {
proxyServiceStatisticsStack.reportToStatisticsCollector(statisticsCollector,isFault);
}
- ProxyServiceStatisticsStack synapseServiceStatisticsStack = (ProxyServiceStatisticsStack) synCtx.getLocalProperty(Constants.SYNAPSESERVICE_STATISTICS_STACK);
+ ProxyServiceStatisticsStack synapseServiceStatisticsStack = (ProxyServiceStatisticsStack) synCtx.getProperty(Constants.SYNAPSESERVICE_STATISTICS_STACK);
if (synapseServiceStatisticsStack != null) {
synapseServiceStatisticsStack.reportToStatisticsCollector(statisticsCollector,isFault);
}
@@ -56,7 +56,7 @@
public static void processEndPointStatistics(MessageContext synCtx) {
StatisticsCollector statisticsCollector = getStatisticsCollector(synCtx);
boolean isFault = synCtx.getEnvelope().getBody().hasFault();
- EndPointStatisticsStack endPointStatisticsStack = (EndPointStatisticsStack) synCtx.getLocalProperty(Constants.ENDPOINT_STATISTICS_STACK);
+ EndPointStatisticsStack endPointStatisticsStack = (EndPointStatisticsStack) synCtx.getProperty(Constants.ENDPOINT_STATISTICS_STACK);
if (endPointStatisticsStack != null) {
endPointStatisticsStack.reportToStatisticsCollector(statisticsCollector,isFault);
}
@@ -70,7 +70,7 @@
public static void processSequenceStatistics(MessageContext synCtx) {
StatisticsCollector statisticsCollector = getStatisticsCollector(synCtx);
boolean isFault = synCtx.getEnvelope().getBody().hasFault();
- SequenceStatisticsStack sequenceStatisticsStack = (SequenceStatisticsStack) synCtx.getLocalProperty(Constants.SEQUENCE_STATISTICS_STACK);
+ SequenceStatisticsStack sequenceStatisticsStack = (SequenceStatisticsStack) synCtx.getProperty(Constants.SEQUENCE_STATISTICS_STACK);
if (sequenceStatisticsStack != null) {
sequenceStatisticsStack.reportToStatisticsCollector(statisticsCollector,isFault);
}
@@ -84,7 +84,7 @@
public static void processAllSequenceStatistics(MessageContext synCtx) {
StatisticsCollector statisticsCollector = getStatisticsCollector(synCtx);
boolean isFault = synCtx.getEnvelope().getBody().hasFault();
- SequenceStatisticsStack sequenceStatisticsStack = (SequenceStatisticsStack) synCtx.getLocalProperty(Constants.SEQUENCE_STATISTICS_STACK);
+ SequenceStatisticsStack sequenceStatisticsStack = (SequenceStatisticsStack) synCtx.getProperty(Constants.SEQUENCE_STATISTICS_STACK);
if (sequenceStatisticsStack != null) {
sequenceStatisticsStack.reportAllToStatisticsCollector(statisticsCollector,isFault);
}
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=515911&r1=515910&r2=515911
==============================================================================
--- 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 Mar 7 20:09:24 2007
@@ -27,7 +27,7 @@
import org.apache.axis2.addressing.RelatesTo;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.core.SynapseEnvironment;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
+import org.apache.synapse.endpoints.Endpoint;
import java.util.HashMap;
import java.util.Map;
@@ -61,7 +61,7 @@
public void setEnvironment(SynapseEnvironment se) {
}
- public Object getLocalProperty(String key) {
+ public Object getProperty(String key) {
return properties.get(key);
}
@@ -80,7 +80,7 @@
properties.put(key, value);
}
- public Set getLocalPropertyKeySet() {
+ public Set getPropertyKeySet() {
return properties.keySet();
}
Modified: webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java Wed Mar 7 20:09:24 2007
@@ -19,13 +19,12 @@
package org.apache.synapse.config.xml;
-import org.apache.axiom.om.impl.exception.XMLComparisonException;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.OMElement;
import org.apache.synapse.mediators.builtin.send.SendMediator;
-import org.apache.synapse.mediators.builtin.send.endpoints.LoadbalanceEndpoint;
-import org.apache.synapse.mediators.builtin.send.endpoints.AddressEndpoint;
-import org.apache.synapse.mediators.builtin.send.endpoints.FailoverEndpoint;
+import org.apache.synapse.endpoints.LoadbalanceEndpoint;
+import org.apache.synapse.endpoints.AddressEndpoint;
+import org.apache.synapse.endpoints.FailoverEndpoint;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLInputFactory;
Modified: webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/TestUtils.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/TestUtils.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/TestUtils.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/TestUtils.java Wed Mar 7 20:09:24 2007
@@ -54,7 +54,7 @@
Iterator iter = props.keySet().iterator();
while (iter.hasNext()) {
String key = (String) iter.next();
- testConfig.addResource(key, (Entry)props.get(key));
+ testConfig.addEntry(key, (Entry)props.get(key));
}
}
synCtx.setConfiguration(testConfig);
Modified: webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/base/SequenceMediatorTest.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/base/SequenceMediatorTest.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/base/SequenceMediatorTest.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/base/SequenceMediatorTest.java Wed Mar 7 20:09:24 2007
@@ -117,6 +117,6 @@
assertTrue("T1.T2.T4".equals(result.toString()));
- assertEquals("test", synCtx.getLocalProperty(Constants.ERROR_MESSAGE));
+ assertEquals("test", synCtx.getProperty(Constants.ERROR_MESSAGE));
}
}
Modified: webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/PropertyMediatorTest.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/PropertyMediatorTest.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/PropertyMediatorTest.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/builtin/PropertyMediatorTest.java Wed Mar 7 20:09:24 2007
@@ -75,7 +75,7 @@
prop.setKey("name");
prop.setType(Entry.VALUE_TYPE);
prop.setValue("value");
- synCfg.addResource("name", prop);
+ synCfg.addEntry("name", prop);
synCtx.setConfiguration(synCfg);
assertTrue(
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=515911&r1=515910&r2=515911
==============================================================================
--- 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 Mar 7 20:09:24 2007
@@ -31,7 +31,7 @@
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.mediators.bsf.convertors.OMElementConvertor;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
+import org.apache.synapse.endpoints.Endpoint;
/**
* ScriptMessageContext decorates the Synapse MessageContext adding methods to use the message payload XML in a way natural to the scripting language.
@@ -107,8 +107,8 @@
mc.setEnvironment(se);
}
- public Object getLocalProperty(String key) {
- return mc.getLocalProperty(key);
+ public Object getProperty(String key) {
+ return mc.getProperty(key);
}
public Object getEntry(String key) {
@@ -119,8 +119,8 @@
mc.setProperty(key, value);
}
- public Set getLocalPropertyKeySet() {
- return mc.getLocalPropertyKeySet();
+ public Set getPropertyKeySet() {
+ return mc.getPropertyKeySet();
}
public Mediator getMainSequence() {
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=515911&r1=515910&r2=515911
==============================================================================
--- 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 Mar 7 20:09:24 2007
@@ -29,7 +29,7 @@
import org.apache.synapse.MessageContext;
import org.apache.synapse.Mediator;
import org.apache.synapse.FaultHandler;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
+import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.core.SynapseEnvironment;
@@ -113,16 +113,16 @@
return getMC().getWSAMessageID();
}
- public Object getLocalProperty(String key) {
- return getMC().getLocalProperty(key);
+ public Object getProperty(String key) {
+ return getMC().getProperty(key);
}
public Object getEntry(String key) {
return getMC().getEntry(key);
}
- public Set getLocalPropertyKeySet() {
- return getMC().getLocalPropertyKeySet();
+ public Set getPropertyKeySet() {
+ return getMC().getPropertyKeySet();
}
public Mediator getMainSequence() {
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=515911&r1=515910&r2=515911
==============================================================================
--- 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 Mar 7 20:09:24 2007
@@ -27,7 +27,7 @@
import org.apache.axis2.addressing.RelatesTo;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.core.SynapseEnvironment;
-import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
+import org.apache.synapse.endpoints.Endpoint;
import java.util.HashMap;
import java.util.Map;
@@ -61,7 +61,7 @@
public void setEnvironment(SynapseEnvironment se) {
}
- public Object getLocalProperty(String key) {
+ public Object getProperty(String key) {
return properties.get(key);
}
@@ -80,7 +80,7 @@
properties.put(key, value);
}
- public Set getLocalPropertyKeySet() {
+ public Set getPropertyKeySet() {
return properties.keySet();
}
Modified: webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/TestUtils.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/TestUtils.java?view=diff&rev=515911&r1=515910&r2=515911
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/TestUtils.java (original)
+++ webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/TestUtils.java Wed Mar 7 20:09:24 2007
@@ -55,7 +55,7 @@
Iterator iter = props.keySet().iterator();
while (iter.hasNext()) {
String key = (String) iter.next();
- testConfig.addResource(key, (Entry)props.get(key));
+ testConfig.addEntry(key, (Entry)props.get(key));
}
}
synCtx.setConfiguration(testConfig);
@@ -86,7 +86,7 @@
Iterator iter = props.keySet().iterator();
while (iter.hasNext()) {
String key = (String) iter.next();
- testConfig.addResource(key, (Entry) props.get(key));
+ testConfig.addEntry(key, (Entry) props.get(key));
}
}
synCtx.setConfiguration(testConfig);
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org