You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by as...@apache.org on 2007/03/06 08:52:33 UTC
svn commit: r515014 [2/3] - 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/...
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=515014&r1=515013&r2=515014
==============================================================================
--- 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 Mon Mar 5 23:52:29 2007
@@ -26,102 +26,109 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.config.EndpointDefinition;
+import org.apache.synapse.Mediator;
+import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
import org.apache.synapse.config.SynapseConfiguration;
-import org.apache.synapse.config.Property;
+import org.apache.synapse.config.Entry;
+import org.apache.synapse.config.xml.endpoints.EndpointSerializer;
import org.apache.synapse.core.axis2.ProxyService;
import javax.xml.stream.XMLStreamException;
import java.io.OutputStream;
import java.util.Iterator;
+import java.util.Map;
+import java.util.HashMap;
+/**
+ * Serialize a SynapseConfiguration into an OutputStream
+ */
public class XMLConfigurationSerializer {
private static final Log log = LogFactory.getLog(XMLConfigurationSerializer.class);
- protected static final OMFactory fac = OMAbstractFactory.getOMFactory();
- protected static final OMNamespace synNS = fac.createOMNamespace(Constants.SYNAPSE_NAMESPACE, "syn");
- protected static final OMNamespace nullNS = fac.createOMNamespace(Constants.NULL_NAMESPACE, "");
+ private static final OMFactory fac = OMAbstractFactory.getOMFactory();
+ private static final OMNamespace synNS = fac.createOMNamespace(Constants.SYNAPSE_NAMESPACE, "syn");
+ private static final OMNamespace nullNS = fac.createOMNamespace(Constants.NULL_NAMESPACE, "");
+
+ /**
+ * order of entries is irrelavant, however its nice to have some order
+ * @param synCfg
+ * @param outputStream
+ * @throws XMLStreamException
+ */
+ public static void serializeConfiguration(SynapseConfiguration synCfg,
+ OutputStream outputStream) throws XMLStreamException {
+ OMElement definitions = fac.createOMElement("definitions", synNS);
- public static void serializeConfiguration(SynapseConfiguration synCfg, OutputStream outputStream)
- throws XMLStreamException {
-
- OMElement synapse = fac.createOMElement("synapse", synNS);
+ // first process a remote registry if present
+ if (synCfg.getRegistry() != null) {
+ RegistrySerializer.serializeRegistry(definitions, synCfg.getRegistry());
+ }
- // process registries
- Iterator iter = synCfg.getRegistries().keySet().iterator();
+ // add proxy services
+ Iterator iter = synCfg.getProxyServices().iterator();
while (iter.hasNext()) {
- RegistrySerializer.serializeRegistry(synapse, synCfg.getRegistry((String) iter.next()));
+ ProxyService service = (ProxyService) iter.next();
+ ProxyServiceSerializer.serializeProxy(definitions, service);
}
- OMElement definitions = fac.createOMElement("definitions", synNS);
+ Map entries = new HashMap();
+ Map endpoints = new HashMap();
+ Map sequences = new HashMap();
- // process properties
- serializeProperties(definitions, synCfg);
+ iter = synCfg.getLocalRegistry().keySet().iterator();
+ while (iter.hasNext()) {
+ Object key = iter.next();
+ Object o = synCfg.getLocalRegistry().get(key);
+ if (o instanceof Mediator) {
+ sequences.put(key, o);
+ } else if (o instanceof Endpoint) {
+ endpoints.put(key, o);
+ } else if (o instanceof Entry) {
+ entries.put(key, o);
+ } else {
+ handleException("Unknown object : " + o.getClass()
+ + " for serialization into Synapse configuration");
+ }
+ }
+
+ // process entries
+ serializeEntries(definitions, entries);
// process endpoints
- serializeEndpoints(definitions, synCfg);
+ serializeEndpoints(definitions, endpoints);
// process sequences
- iter = synCfg.getNamedSequences().keySet().iterator();
- while (iter.hasNext()) {
- String name = (String) iter.next();
- definitions.addChild(
- MediatorSerializerFinder.getInstance().getSerializer(synCfg.getNamedSequence(name))
- .serializeMediator(null, synCfg.getNamedSequence(name)));
- }
+ serializeSequences(definitions, sequences);
- // add definitions
- synapse.addChild(definitions);
+ definitions.serialize(outputStream);
+ }
- // add proxy services
- OMElement proxies = fac.createOMElement("proxies", synNS);
- iter = synCfg.getProxyServices().iterator();
+ private static void serializeEntries(OMElement definitions, Map entries) {
+ Iterator iter = entries.keySet().iterator();
while (iter.hasNext()) {
- ProxyService service = (ProxyService) iter.next();
- ProxyServiceSerializer.serializeProxy(proxies, service);
+ String key = (String) iter.next();
+ EntrySerializer.serializeEntry((Entry) entries.get(key), definitions);
}
- synapse.addChild(proxies);
-
- // process main mediator
- synapse.addChild(
- MediatorSerializerFinder.getInstance().getSerializer(synCfg.getMainMediator())
- .serializeMediator(null, synCfg.getMainMediator()));
-
- synapse.serialize(outputStream);
}
- private static void serializeProperties(OMElement definitions, SynapseConfiguration synCfg) {
- Iterator iter = synCfg.getGlobalProps().keySet().iterator();
+ private static void serializeEndpoints(OMElement definitions, Map endpoints) {
+ Iterator iter = endpoints.keySet().iterator();
while (iter.hasNext()) {
- String propertyName = (String) iter.next();
- PropertySerializer.serializeProperty(
- synCfg.getPropertyObject(propertyName), definitions);
+ String key = (String) iter.next();
+ //EndpointSerializer.serializeEndpoint((Endpoint) endpoints.get(key), definitions);
+ // TODO chathura
}
}
- private static void serializeEndpoints(OMElement definitions, SynapseConfiguration synCfg) {
-
- Iterator iter = synCfg.getNamedEndpoints().keySet().iterator();
+ private static void serializeSequences(OMElement definitions, Map sequences) {
+ Iterator iter = sequences.keySet().iterator();
while (iter.hasNext()) {
- String endpointName = (String) iter.next();
- Object endpt = synCfg.getNamedEndpoint(endpointName);
-
- if (endpt instanceof Property) {
- OMElement endpoint = fac.createOMElement("endpoint", synNS);
- Property dp = (Property) endpt;
- endpoint.addAttribute(fac.createOMAttribute(
- "name", nullNS, endpointName));
- endpoint.addAttribute(fac.createOMAttribute(
- "key", nullNS, dp.getKey()));
- definitions.addChild(endpoint);
-
- } else if (endpt instanceof EndpointDefinition) {
- EndpointDefinitionSerializer.serializeEndpoint((EndpointDefinition) endpt, definitions);
- } else {
- handleException("Invalid endpoint. Type : " + endpt.getClass());
- }
+ String key = (String) iter.next();
+ Mediator mediator = (Mediator) sequences.get(key);
+ MediatorSerializerFinder.getInstance().getSerializer(mediator)
+ .serializeMediator(definitions, mediator);
}
}
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=515014&r1=515013&r2=515014
==============================================================================
--- 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 Mon Mar 5 23:52:29 2007
@@ -22,22 +22,15 @@
import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
import org.apache.synapse.mediators.builtin.send.endpoints.AddressEndpoint;
import org.apache.synapse.config.EndpointDefinition;
-import org.apache.synapse.config.xml.endpoints.utils.WSDL11EndpointBuilder;
-import org.apache.synapse.config.xml.endpoints.utils.WSDL20EndpointBuilder;
import org.apache.synapse.Constants;
import org.apache.synapse.SynapseException;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.axis2.wsdl.WSDLConstants;
import javax.xml.namespace.QName;
-import java.net.URL;
-import java.net.MalformedURLException;
-import java.io.IOException;
public class AddressEndpointFactory implements EndpointFactory {
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=515014&r1=515013&r2=515014
==============================================================================
--- 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 Mon Mar 5 23:52:29 2007
@@ -56,7 +56,7 @@
response.setOperationContext(axisOutMsgCtx.getOperationContext());
response.setAxisService(axisOutMsgCtx.getAxisService());
-
+
// set properties on response
response.setServerSide(true);
response.setProperty(Constants.ISRESPONSE_PROPERTY, Boolean.TRUE);
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java Mon Mar 5 23:52:29 2007
@@ -222,7 +222,7 @@
* @return the Policy object with the given name, from the configuration
*/
private static Policy getPolicy(org.apache.synapse.MessageContext synCtx, String propertyKey) {
- Object property = synCtx.getConfiguration().getProperty(propertyKey);
+ Object property = synCtx.getConfiguration().getEntry(propertyKey);
if (property != null && property instanceof OMElement) {
return PolicyEngine.getPolicy((OMElement) property);
} else {
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=515014&r1=515013&r2=515014
==============================================================================
--- 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 Mon Mar 5 23:52:29 2007
@@ -20,7 +20,6 @@
package org.apache.synapse.core.axis2;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.axiom.om.impl.llom.OMTextImpl;
@@ -28,12 +27,10 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.RelatesTo;
-import org.apache.synapse.Constants;
-import org.apache.synapse.MessageContext;
-import org.apache.synapse.SynapseException;
-import org.apache.synapse.FaultHandler;
+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.config.SynapseConfiguration;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.commons.logging.Log;
@@ -51,6 +48,7 @@
private SynapseConfiguration cfg = null;
private SynapseEnvironment env = null;
private Map properties = new HashMap();
+ private Map localEntries = new HashMap();
private Stack faultStack = new Stack();
/** The Axis2 MessageContext reference */
@@ -78,12 +76,60 @@
this.env = env;
}
+ public Mediator getMainSequence() {
+ Object o = localEntries.get(Constants.MAIN_SEQUENCE_KEY);
+ if (o != null && o instanceof Mediator) {
+ return (Mediator) o;
+ } else {
+ Mediator main = getConfiguration().getMainSequence();
+ localEntries.put(Constants.MAIN_SEQUENCE_KEY, main);
+ return main;
+ }
+ }
+
+ public Mediator getFaultSequence() {
+ Object o = localEntries.get(Constants.FAULT_SEQUENCE_KEY);
+ if (o != null && o instanceof Mediator) {
+ return (Mediator) o;
+ } else {
+ Mediator fault = getConfiguration().getFaultSequence();
+ localEntries.put(Constants.FAULT_SEQUENCE_KEY, fault);
+ return fault;
+ }
+ }
+
+ public Mediator getSequence(String key) {
+ Object o = localEntries.get(key);
+ if (o != null && o instanceof Mediator) {
+ return (Mediator) o;
+ } else {
+ Mediator m = getConfiguration().getSequence(key);
+ localEntries.put(key, m);
+ return m;
+ }
+ }
+
+ public Endpoint getEndpoint(String key) {
+ Object o = localEntries.get(key);
+ if (o != null && o instanceof Endpoint) {
+ return (Endpoint) o;
+ } else {
+ Endpoint e = getConfiguration().getEndpoint(key);
+ localEntries.put(key, e);
+ return e;
+ }
+ }
+
+ public Object getLocalProperty(String key) {
+ return properties.get(key);
+ }
+
public Object getProperty(String key) {
Object ret = properties.get(key);
if (ret != null) {
return ret;
} else if (getConfiguration() != null) {
- return getConfiguration().getProperty(key);
+ return getConfiguration().getEntry(key);
} else {
return null;
}
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=515014&r1=515013&r2=515014
==============================================================================
--- 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 Mon Mar 5 23:52:29 2007
@@ -63,40 +63,40 @@
}
// if this is a response to a proxy service
- if (synCtx.getProperty(Constants.PROXY_SERVICE) != null) {
+ if (synCtx.getLocalProperty(Constants.PROXY_SERVICE) != null) {
- if (synCtx.getConfiguration().getProxyService((String) synCtx.getProperty(Constants.PROXY_SERVICE))
+ if (synCtx.getConfiguration().getProxyService((String) synCtx.getLocalProperty(Constants.PROXY_SERVICE))
.getTargetOutSequence() != null) {
String sequenceName = synCtx.getConfiguration().getProxyService(
- (String) synCtx.getProperty(Constants.PROXY_SERVICE)).getTargetOutSequence();
- Mediator outSequence = synCtx.getConfiguration().getNamedSequence(sequenceName);
+ (String) synCtx.getLocalProperty(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.getProperty(Constants.PROXY_SERVICE));
+ "the proxy service " + synCtx.getLocalProperty(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.getProperty(
+ } else if (synCtx.getConfiguration().getProxyService((String) synCtx.getLocalProperty(
Constants.PROXY_SERVICE)).getTargetInLineOutSequence() != null) {
log.debug("Using the anonymous out sequence specified in the proxy service "
- + synCtx.getProperty(Constants.PROXY_SERVICE) + " for out going message mediation");
- synCtx.getConfiguration().getProxyService((String) synCtx.getProperty(
+ + synCtx.getLocalProperty(Constants.PROXY_SERVICE) + " for out going message mediation");
+ synCtx.getConfiguration().getProxyService((String) synCtx.getLocalProperty(
Constants.PROXY_SERVICE)).getTargetInLineOutSequence().mediate(synCtx);
} else {
- log.debug("Proxy service " + synCtx.getProperty(Constants.PROXY_SERVICE) + " does not specifies " +
+ log.debug("Proxy service " + synCtx.getLocalProperty(Constants.PROXY_SERVICE) + " does not specifies " +
"an out sequence - sending the response back");
Axis2Sender.sendBack(synCtx);
}
} else {
- synCtx.getConfiguration().getMainMediator().mediate(synCtx);
+ synCtx.getMainSequence().mediate(synCtx);
}
}
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java Mon Mar 5 23:52:29 2007
@@ -20,35 +20,23 @@
package org.apache.synapse.core.axis2;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
import org.apache.axis2.transport.TransportUtils;
import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.util.UUIDGenerator;
-import org.apache.axis2.util.CallbackReceiver;
import org.apache.axis2.util.TargetResolver;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.RelatesTo;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.async.Callback;
-import org.apache.axis2.client.async.AsyncResult;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.OperationContext;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.*;
import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.synapse.SynapseException;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPFault;
-import org.apache.axiom.soap.SOAPBody;
-import org.apache.axiom.om.OMElement;
import javax.xml.namespace.QName;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Iterator;
/**
* DynamicAxisOperation which switch dynamically between MEPs
@@ -155,9 +143,9 @@
callbackReceiver.addCallback(outMsgCtx.getMessageID(), callback);
EndpointReference replyToFromTransport = outMsgCtx
.getConfigurationContext().getListenerManager()
- .getEPRforService(sc.getAxisService().getName(),
- axisOp.getName().getLocalPart(),
- outMsgCtx.getTransportOut().getName().getLocalPart());
+ .getEPRforService(sc.getAxisService().getKey(),
+ axisOp.getKey().getLocalPart(),
+ outMsgCtx.getTransportOut().getKey().getLocalPart());
if (outMsgCtx.getReplyTo() == null) {
outMsgCtx.setReplyTo(replyToFromTransport);
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=515014&r1=515013&r2=515014
==============================================================================
--- 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 Mon Mar 5 23:52:29 2007
@@ -176,7 +176,7 @@
InputStream wsdlInputStream = null;
OMElement wsdlElement = null;
if (wsdlKey != null) {
- Object keyObject = synCfg.getProperty(wsdlKey);
+ Object keyObject = synCfg.getEntry(wsdlKey);
if (keyObject instanceof OMElement) {
wsdlElement = (OMElement) keyObject;
}
@@ -304,7 +304,7 @@
iter = serviceLevelPolicies.iterator();
while (iter.hasNext()) {
String policyKey = (String) iter.next();
- Object policyProp = synCfg.getProperty(policyKey);
+ Object policyProp = synCfg.getEntry(policyKey);
if (policyProp != null) {
if (svcEffectivePolicy == null) {
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=515014&r1=515013&r2=515014
==============================================================================
--- 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 Mon Mar 5 23:52:29 2007
@@ -74,11 +74,11 @@
if (proxy.getTargetFaultSequence() != null) {
- Mediator faultSequence = synCtx.getConfiguration().getNamedSequence(proxy.getTargetFaultSequence());
+ Mediator faultSequence = synCtx.getSequence(proxy.getTargetFaultSequence());
if (faultSequence != null) {
log.debug("setting the fault sequence of the proxy to context");
synCtx.pushFault(new MediatorFaultHandler(
- synCtx.getConfiguration().getNamedSequence(proxy.getTargetFaultSequence())));
+ synCtx.getSequence(proxy.getTargetFaultSequence())));
} else {
// when we can not find the reference to the fault sequence of the proxy service we should not
// throw an exception because still we have the global fault sequence and the message mediation
@@ -94,7 +94,7 @@
// Using inSequence for the incoming message mediation
if (proxy.getTargetInSequence() != null) {
- Mediator inSequence = synCtx.getConfiguration().getNamedSequence(proxy.getTargetInSequence());
+ Mediator inSequence = synCtx.getSequence(proxy.getTargetInSequence());
if (inSequence != null) {
log.debug("Using the sequence named " + proxy.getTargetInSequence() + " for message mediation");
inSequence.mediate(synCtx);
@@ -111,7 +111,7 @@
}
if (proxy.getTargetEndpoint() != null) {
- Endpoint endpoint = synCtx.getConfiguration().getNamedEndpoint(proxy.getTargetEndpoint());
+ Endpoint endpoint = synCtx.getEndpoint(proxy.getTargetEndpoint());
if (endpoint != null) {
log.debug("Forwarding message to the endpoint named "
+ proxy.getTargetEndpoint() + " after message mediation");
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=515014&r1=515013&r2=515014
==============================================================================
--- 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 Mon Mar 5 23:52:29 2007
@@ -20,7 +20,6 @@
package org.apache.synapse.core.axis2;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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=515014&r1=515013&r2=515014
==============================================================================
--- 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 Mon Mar 5 23:52:29 2007
@@ -58,7 +58,7 @@
log.warn("Property key value for lookup was not specified");
return null;
} else if (size == 1) {
- return evaluate(Constants.SCOPE_CORRELATE, args.get(0), context.getNavigator());
+ return evaluate(Constants.SCOPE_DEFAULT, args.get(0), context.getNavigator());
} else if (size == 2) {
return evaluate(args.get(0), args.get(1), context.getNavigator());
} else {
@@ -84,7 +84,7 @@
" or synapse:get-property(prop-name) Xpath function");
return null;
}
- if (Constants.SCOPE_CORRELATE.equals(scope)) {
+ if (Constants.SCOPE_DEFAULT.equals(scope)) {
Object result = synCtx.getProperty(key);
if (result != null) {
return result;
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=515014&r1=515013&r2=515014
==============================================================================
--- 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 Mon Mar 5 23:52:29 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.getProperty(Constants.SEQUENCE_STATISTICS_STACK);
+ StatisticsStack sequenceStack = (StatisticsStack) synCtx.getLocalProperty(Constants.SEQUENCE_STATISTICS_STACK);
if (sequenceStack == null) {
sequenceStack = new SequenceStatisticsStack();
synCtx.setProperty(Constants.SEQUENCE_STATISTICS_STACK, sequenceStack);
@@ -97,7 +97,7 @@
}
// set exception information to message context
Axis2MessageContext.setErrorInformation(synCtx, e);
- Mediator errHandler = synCtx.getConfiguration().getNamedSequence(errorHandler);
+ Mediator errHandler = synCtx.getSequence(errorHandler);
if (errHandler == null) {
if (shouldTrace) {
trace.trace("Sequence " + name + "; error handler sequence named '" +
@@ -134,7 +134,7 @@
}
} else {
- Mediator m = synCtx.getConfiguration().getNamedSequence(ref);
+ Mediator m = synCtx.getSequence(ref);
if (m == null) {
if (shouldTrace) {
trace.trace("Sequence named " + ref + " cannot be found.");
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=515014&r1=515013&r2=515014
==============================================================================
--- 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 Mon Mar 5 23:52:29 2007
@@ -35,7 +35,7 @@
* holds the list of mediators supplied within the <rules> element of an XML
* based Synapse configuration
*
- * @see org.apache.synapse.config.SynapseConfiguration#getMainMediator()
+ * @see org.apache.synapse.config.SynapseConfiguration#getMainSequence()
*/
public class SynapseMediator extends AbstractListMediator {
@@ -53,7 +53,7 @@
if(synCtx.isResponse()) {
StatisticsUtils.processAllSequenceStatistics(synCtx);
}
- StatisticsStack sequenceStack = (StatisticsStack) synCtx.getProperty(Constants.SEQUENCE_STATISTICS_STACK);
+ StatisticsStack sequenceStack = (StatisticsStack) synCtx.getLocalProperty(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=515014&r1=515013&r2=515014
==============================================================================
--- 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 Mon Mar 5 23:52:29 2007
@@ -53,25 +53,25 @@
* @return true always
*/
public boolean mediate(MessageContext smc) {
- log.debug("Set-Property mediator :: mediate()");
+ log.debug("Set-Entry mediator :: mediate()");
boolean shouldTrace = shouldTrace(smc.getTracingState());
if (shouldTrace) {
- trace.trace("Start : Property mediator");
+ trace.trace("Start : Entry mediator");
}
String value = (this.value != null ? this.value : Axis2MessageContext.getStringValue(
getExpression(), smc));
log.debug("Setting property : " + name +
" (scope:" + (scope == null ? "default" : scope) + ") = " + value);
if (shouldTrace) {
- trace.trace("Property Name : " + name +
- " (scope:" + (scope == null ? "default" : scope) + ") set to " +
- (this.value != null ? " value = " + this.value :
- " result of expression " + expression + " = " + value));
+ trace.trace("Entry Name : " + getName() +
+ " (scope:" + (scope == null ? "default" : scope) + ") set to " +
+ (getValue() != null ? " value = " + getValue() :
+ " result of expression " + getExpression() + " = " + value));
}
if (scope == null) {
smc.setProperty(name, value);
- } else if (Constants.SCOPE_CORRELATE.equals(scope)) {
+ } else if (Constants.SCOPE_DEFAULT.equals(scope)) {
smc.setProperty(name, value);
} else if (Constants.SCOPE_AXIS2.equals(scope)
@@ -107,7 +107,7 @@
}
if (shouldTrace) {
- trace.trace("End : Property mediator");
+ trace.trace("End : Entry mediator");
}
return true;
}
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java Mon Mar 5 23:52:29 2007
@@ -13,7 +13,7 @@
import org.apache.synapse.Constants;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.config.Property;
+import org.apache.synapse.config.Entry;
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.mediators.AbstractMediator;
import org.jaxen.JaxenException;
@@ -106,12 +106,12 @@
if (log.isDebugEnabled()) {
log.debug("setting sequenceID " + sequenceID + " for correlation " + correlationValue);
}
- Property sequenceProperty = new Property();
- sequenceProperty.setValue(sequenceID);
- sequenceProperty.setExpiryTime(System.currentTimeMillis() + SEQUENCE_EXPIRY_TIME);
- sequenceMap.put(correlationValue, sequenceProperty);
+ Entry sequenceEntry = new Entry();
+ sequenceEntry.setValue(sequenceID);
+ sequenceEntry.setExpiryTime(System.currentTimeMillis() + SEQUENCE_EXPIRY_TIME);
+ sequenceMap.put(correlationValue, sequenceEntry);
} else {
- sequenceID = (String) ((Property) sequenceMap.get(correlationValue)).getValue();
+ sequenceID = (String) ((Entry) sequenceMap.get(correlationValue)).getValue();
if (log.isDebugEnabled()) {
log.debug("got sequenceID " + sequenceID + " for correlation " + correlationValue);
}
@@ -158,8 +158,8 @@
Iterator itKey = sequenceMap.keySet().iterator();
while (itKey.hasNext()) {
Object key = itKey.next();
- Property sequenceProperty = (Property) sequenceMap.get(key);
- if (sequenceProperty.isExpired()) {
+ Entry sequenceEntry = (Entry) sequenceMap.get(key);
+ if (sequenceEntry.isExpired()) {
sequenceMap.remove(key);
}
}
Modified: 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/mediators/builtin/send/endpoints/AddressEndpoint.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- 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/mediators/builtin/send/endpoints/AddressEndpoint.java Mon Mar 5 23:52:29 2007
@@ -68,6 +68,14 @@
this.active = active;
}
+ public void setDynamic(boolean dynamic) {
+ // TODO chathura
+ }
+
+ public void setRegistryKey(String registryKey) {
+ // TODO chathura
+ }
+
public void send(MessageContext synCtx) {
String eprAddress = null;
Modified: 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/mediators/builtin/send/endpoints/Endpoint.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- 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/mediators/builtin/send/endpoints/Endpoint.java Mon Mar 5 23:52:29 2007
@@ -36,4 +36,8 @@
public boolean isActive();
public void setActive(boolean active);
+
+ public void setDynamic(boolean dynamic);
+
+ public void setRegistryKey(String registryKey);
}
Modified: 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/mediators/builtin/send/endpoints/FailoverEndpoint.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- 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/mediators/builtin/send/endpoints/FailoverEndpoint.java Mon Mar 5 23:52:29 2007
@@ -73,6 +73,14 @@
this.active = active;
}
+ public void setDynamic(boolean dynamic) {
+ // TODO chathura
+ }
+
+ public void setRegistryKey(String registryKey) {
+ // TODO chathura
+ }
+
public ArrayList getEndpoints() {
return endpoints;
}
Modified: 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/mediators/builtin/send/endpoints/IndirectEndpoint.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- 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/mediators/builtin/send/endpoints/IndirectEndpoint.java Mon Mar 5 23:52:29 2007
@@ -30,8 +30,7 @@
public void send(MessageContext synMessageContext) {
// get the actual endpoint and send
- Endpoint endpoint = synMessageContext.getConfiguration().
- getNamedEndpoint(ref);
+ Endpoint endpoint = synMessageContext.getEndpoint(ref);
if (endpoint.isActive()) {
endpoint.send(synMessageContext);
@@ -62,6 +61,14 @@
public void setActive(boolean active) {
this.active = active;
+ }
+
+ public void setDynamic(boolean dynamic) {
+ // TODO chathura
+ }
+
+ public void setRegistryKey(String registryKey) {
+ // TODO chathura
}
public void setParentEndpoint(Endpoint parentEndpoint) {
Modified: 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/mediators/builtin/send/endpoints/LoadbalanceEndpoint.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- 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/mediators/builtin/send/endpoints/LoadbalanceEndpoint.java Mon Mar 5 23:52:29 2007
@@ -81,6 +81,14 @@
this.active = active;
}
+ public void setDynamic(boolean dynamic) {
+ // TODO chathura
+ }
+
+ public void setRegistryKey(String registryKey) {
+ // TODO chathura
+ }
+
public ArrayList getEndpoints() {
return endpoints;
}
Modified: 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/mediators/builtin/send/endpoints/WSDLEndpoint.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- 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/mediators/builtin/send/endpoints/WSDLEndpoint.java Mon Mar 5 23:52:29 2007
@@ -53,6 +53,14 @@
this.active = active;
}
+ public void setDynamic(boolean dynamic) {
+ // TODO chathura
+ }
+
+ public void setRegistryKey(String registryKey) {
+ // TODO chathura
+ }
+
public void setParentEndpoint(Endpoint parentEndpoint) {
this.parentEndpoint = parentEndpoint;
}
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java Mon Mar 5 23:52:29 2007
@@ -87,7 +87,8 @@
return makeSOAPFault(synCtx, SOAP12,shouldTrace);
default : {
if (envelop != null) {
- if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(envelop.getNamespace().getName())) {
+ if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(
+ envelop.getNamespace().getNamespaceURI())) {
return makeSOAPFault(synCtx, SOAP12,shouldTrace);
} else {
return makeSOAPFault(synCtx, SOAP11,shouldTrace);
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=515014&r1=515013&r2=515014
==============================================================================
--- 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 Mon Mar 5 23:52:29 2007
@@ -23,9 +23,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.config.XMLToObjectMapper;
-import org.apache.synapse.config.Property;
-import org.apache.synapse.config.EndpointDefinition;
+import org.apache.synapse.config.Entry;
import org.apache.synapse.mediators.base.SequenceMediator;
+import org.apache.synapse.mediators.builtin.send.endpoints.Endpoint;
import java.net.URI;
import java.util.HashMap;
@@ -38,74 +38,78 @@
private static final Log log = LogFactory.getLog(AbstractRegistry.class);
- /** The name of the registry */
- protected String name = null;
-
/** The list of configuration properties */
protected Map properties = new HashMap();
/**
- * Get the object for the given key from this registry
- * @param dp the DynamicProperty for the registry lookup
+ * Get the resource for the given key from this registry
+ * @param entry
* @return the matching resultant object
*/
- public Object getProperty(Property dp) {
+ public Object getResource(Entry entry) {
OMNode omNode = null;
RegistryEntry re = null;
- // we are dealing with a DynamicProperty. Have we seen this before and processed
- // it at least once and have it cached?
+ // we are dealing with a dynamic resource. Have we seen this before and processed
+ // it at least once and have it cached already?
// if we have an unexpired cached copy, return the cached object
- if (dp.isCached() && !dp.isExpired()) {
- return dp.getValue();
+ if (entry.isCached() && !entry.isExpired()) {
+ return entry.getValue();
// if we have not cached the referenced object, fetch it and its RegistryEntry
- } else if (!dp.isCached()) {
- omNode = lookup(dp.getKey());
- re = getRegistryEntry(dp.getKey());
+ } else if (!entry.isCached()) {
+ omNode = lookup(entry.getKey());
+ if (omNode == null) {
+ return null;
+ } else {
+ re = getRegistryEntry(entry.getKey());
+ }
// if we have cached it before, and now the cache has expired
// get its *new* registry entry and compare versions and pick new cache duration
- } else if (dp.isExpired()) {
+ } else if (entry.isExpired()) {
- log.debug("Cached object has expired for key : " + dp.getKey());
- re = getRegistryEntry(dp.getKey());
+ log.debug("Cached object has expired for key : " + entry.getKey());
+ re = getRegistryEntry(entry.getKey());
if (re.getVersion() != Long.MIN_VALUE &&
- re.getVersion() == dp.getVersion()) {
+ re.getVersion() == entry.getVersion()) {
log.debug("Expired version number is same as current version in registry");
// renew cache lease for another cachable duration (as returned by the
// new getRegistryEntry() call
- dp.setExpiryTime(
+ entry.setExpiryTime(
System.currentTimeMillis() + re.getCachableDuration());
log.debug("Renew cache lease for another " + re.getCachableDuration() / 1000 + "s");
// return cached object
- return dp.getValue();
+ return entry.getValue();
} else {
- omNode = lookup(dp.getKey());
+ omNode = lookup(entry.getKey());
}
}
// if we get here, we have received the raw omNode from the
// registry and our previous copy (if we had one) has expired or is not valid
- if (dp.getMapper() != null) {
- dp.setValue(
- dp.getMapper().getObjectFromOMNode(omNode));
- if (dp.getValue() instanceof SequenceMediator) {
- SequenceMediator seq = (SequenceMediator) dp.getValue();
+ // if we have a XMLToObjectMapper for this entry, use it to convert this
+ // resource into the appropriate object - e.g. sequence or endpoint
+ if (entry.getMapper() != null) {
+ entry.setValue(entry.getMapper().getObjectFromOMNode(omNode));
+
+ if (entry.getValue() instanceof SequenceMediator) {
+ SequenceMediator seq = (SequenceMediator) entry.getValue();
seq.setDynamic(true);
- seq.setRegistryKey(dp.getKey());
- } else if (dp.getValue() instanceof EndpointDefinition) {
- EndpointDefinition ep = (EndpointDefinition) dp.getValue();
+ seq.setRegistryKey(entry.getKey());
+ } else if (entry.getValue() instanceof Endpoint) {
+ Endpoint ep = (Endpoint) entry.getValue();
ep.setDynamic(true);
- ep.setRegistryKey(dp.getKey());
+ ep.setRegistryKey(entry.getKey());
}
+
} else {
// if the type of the object is known to have a mapper, create the
// resultant Object using the known mapper, and cache this Object
@@ -114,33 +118,24 @@
XMLToObjectMapper mapper = getMapper(re.getType());
if (mapper != null) {
- dp.setMapper(mapper);
- dp.setValue(mapper.getObjectFromOMNode(omNode));
+ entry.setMapper(mapper);
+ entry.setValue(mapper.getObjectFromOMNode(omNode));
} else {
- dp.setValue(omNode);
+ entry.setValue(omNode);
}
}
}
// increment cache expiry time as specified by the last getRegistryEntry() call
- dp.setExpiryTime(
- System.currentTimeMillis() + re.getCachableDuration());
- dp.setVersion(re.getVersion());
+ entry.setExpiryTime(System.currentTimeMillis() + re.getCachableDuration());
+ entry.setVersion(re.getVersion());
- return dp.getValue();
+ return entry.getValue();
}
private XMLToObjectMapper getMapper(URI type) {
return null;
- }
-
- public void setRegistryName(String name) {
- this.name = name;
- }
-
- public String getRegistryName() {
- return name;
}
public String getProviderClass() {
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/Registry.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/Registry.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/Registry.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/Registry.java Mon Mar 5 23:52:29 2007
@@ -20,7 +20,7 @@
package org.apache.synapse.registry;
import org.apache.axiom.om.OMNode;
-import org.apache.synapse.config.Property;
+import org.apache.synapse.config.Entry;
import java.util.Map;
@@ -41,10 +41,10 @@
* the content from the registry and cache if required.
* @see AbstractRegistry
*
- * @param dp the DynamicProperty
+ * @param entry the registry Entry
* @return the value from the registry or local cache
*/
- public Object getProperty(Property dp);
+ public Object getResource(Entry entry);
/**
* Get the registry entry for the given key
@@ -72,18 +72,6 @@
* @return Array of decendant registry entries of the given registry entry
*/
public RegistryEntry[] getDescendants(RegistryEntry entry);
-
- /**
- * Get the name of this registry
- * @return name of the registry
- */
- public String getRegistryName();
-
- /**
- * Set the name of this registry
- * @param name of this registry
- */
- public void setRegistryName(String name);
/**
* Return the name of the implementation class
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java Mon Mar 5 23:52:29 2007
@@ -50,10 +50,15 @@
public OMNode lookup(String key) {
log.info("==> Repository fetch of resource with key : " + key);
+ URLConnection urlc = null;
try {
URL url = new URL(getRoot() + key);
- URLConnection urlc = url.openConnection();
+ urlc = url.openConnection();
+ } catch (IOException e) {
+ return null;
+ }
+ try {
XMLStreamReader parser = XMLInputFactory.newInstance().
createXMLStreamReader(urlc.getInputStream());
StAXOMBuilder builder = new StAXOMBuilder(parser);
@@ -61,6 +66,8 @@
} catch (MalformedURLException e) {
handleException("Invalid URL reference " + getRoot() + key, e);
+ } catch (FileNotFoundException fnf) {
+ return null;
} catch (IOException e) {
handleException("IO Error reading from URL " + getRoot() + key, e);
} catch (XMLStreamException e) {
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=515014&r1=515013&r2=515014
==============================================================================
--- 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 Mon Mar 5 23:52:29 2007
@@ -38,11 +38,11 @@
StatisticsCollector statisticsCollector = getStatisticsCollector(synCtx);
boolean isFault = synCtx.getEnvelope().getBody().hasFault();
- ProxyServiceStatisticsStack proxyServiceStatisticsStack = (ProxyServiceStatisticsStack) synCtx.getProperty(Constants.PROXYSERVICE_STATISTICS_STACK);
+ ProxyServiceStatisticsStack proxyServiceStatisticsStack = (ProxyServiceStatisticsStack) synCtx.getLocalProperty(Constants.PROXYSERVICE_STATISTICS_STACK);
if (proxyServiceStatisticsStack != null) {
proxyServiceStatisticsStack.reportToStatisticsCollector(statisticsCollector,isFault);
}
- ProxyServiceStatisticsStack synapseServiceStatisticsStack = (ProxyServiceStatisticsStack) synCtx.getProperty(Constants.SYNAPSESERVICE_STATISTICS_STACK);
+ ProxyServiceStatisticsStack synapseServiceStatisticsStack = (ProxyServiceStatisticsStack) synCtx.getLocalProperty(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.getProperty(Constants.ENDPOINT_STATISTICS_STACK);
+ EndPointStatisticsStack endPointStatisticsStack = (EndPointStatisticsStack) synCtx.getLocalProperty(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.getProperty(Constants.SEQUENCE_STATISTICS_STACK);
+ SequenceStatisticsStack sequenceStatisticsStack = (SequenceStatisticsStack) synCtx.getLocalProperty(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.getProperty(Constants.SEQUENCE_STATISTICS_STACK);
+ SequenceStatisticsStack sequenceStatisticsStack = (SequenceStatisticsStack) synCtx.getLocalProperty(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=515014&r1=515013&r2=515014
==============================================================================
--- 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 Mon Mar 5 23:52:29 2007
@@ -27,6 +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 java.util.HashMap;
import java.util.Map;
@@ -37,12 +38,14 @@
private Map properties = new HashMap();
+ private Map localEntries = new HashMap();
+
private SynapseConfiguration synCfg = null;
SOAPEnvelope envelope = null;
private EndpointReference to = null;
-
+
public SynapseConfiguration getConfiguration() {
return synCfg;
}
@@ -58,12 +61,16 @@
public void setEnvironment(SynapseEnvironment se) {
}
+ public Object getLocalProperty(String key) {
+ return properties.get(key);
+ }
+
public Object getProperty(String key) {
Object ret = properties.get(key);
if (ret != null) {
return ret;
} else if (getConfiguration() != null) {
- return getConfiguration().getProperty(key);
+ return getConfiguration().getEntry(key);
} else {
return null;
}
@@ -77,6 +84,50 @@
return properties.keySet();
}
+ public Mediator getMainSequence() {
+ Object o = localEntries.get(Constants.MAIN_SEQUENCE_KEY);
+ if (o != null && o instanceof Mediator) {
+ return (Mediator) o;
+ } else {
+ Mediator main = getConfiguration().getMainSequence();
+ localEntries.put(Constants.MAIN_SEQUENCE_KEY, main);
+ return main;
+ }
+ }
+
+ public Mediator getFaultSequence() {
+ Object o = localEntries.get(Constants.FAULT_SEQUENCE_KEY);
+ if (o != null && o instanceof Mediator) {
+ return (Mediator) o;
+ } else {
+ Mediator fault = getConfiguration().getFaultSequence();
+ localEntries.put(Constants.FAULT_SEQUENCE_KEY, fault);
+ return fault;
+ }
+ }
+
+ public Mediator getSequence(String key) {
+ Object o = localEntries.get(key);
+ if (o != null && o instanceof Mediator) {
+ return (Mediator) o;
+ } else {
+ Mediator m = getConfiguration().getSequence(key);
+ localEntries.put(key, m);
+ return m;
+ }
+ }
+
+ public Endpoint getEndpoint(String key) {
+ Object o = localEntries.get(key);
+ if (o != null && o instanceof Endpoint) {
+ return (Endpoint) o;
+ } else {
+ Endpoint e = getConfiguration().getEndpoint(key);
+ localEntries.put(key, e);
+ return e;
+ }
+ }
+
//---------
public SOAPEnvelope getEnvelope() {
if (envelope == null)
@@ -175,7 +226,8 @@
}
public boolean isSOAP11() {
- return envelope.getNamespace().getName().equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+ return envelope.getNamespace().getNamespaceURI().equals(
+ SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
}
public void setResponse(boolean b) {
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=515014&r1=515013&r2=515014
==============================================================================
--- 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 Mon Mar 5 23:52:29 2007
@@ -19,7 +19,6 @@
package org.apache.synapse.mediators;
-import java.io.ByteArrayInputStream;
import java.io.StringReader;
import java.util.Iterator;
import java.util.Map;
@@ -35,7 +34,7 @@
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.synapse.MessageContext;
import org.apache.synapse.TestMessageContext;
-import org.apache.synapse.config.Property;
+import org.apache.synapse.config.Entry;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.core.axis2.Axis2MessageContext;
@@ -49,13 +48,13 @@
// create a test synapse context
TestMessageContext synCtx = new TestMessageContext();
SynapseConfiguration testConfig = new SynapseConfiguration();
- testConfig.addRegistry(null, new SimpleURLRegistry());
+ testConfig.setRegistry(new SimpleURLRegistry());
if (props != null) {
Iterator iter = props.keySet().iterator();
while (iter.hasNext()) {
String key = (String) iter.next();
- testConfig.addProperty(key, (Property)props.get(key));
+ testConfig.addResource(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=515014&r1=515013&r2=515014
==============================================================================
--- 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 Mon Mar 5 23:52:29 2007
@@ -111,12 +111,12 @@
// invoke transformation, with static enveope
MessageContext synCtx = TestUtils.getTestContext("<empty/>");
- synCtx.getConfiguration().addNamedSequence("myErrorHandler", seqErr);
+ synCtx.getConfiguration().addSequence("myErrorHandler", seqErr);
seq.mediate(synCtx);
assertTrue("T1.T2.T4".equals(result.toString()));
- assertEquals("test", synCtx.getProperty(Constants.ERROR_MESSAGE));
+ assertEquals("test", synCtx.getLocalProperty(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=515014&r1=515013&r2=515014
==============================================================================
--- 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 Mon Mar 5 23:52:29 2007
@@ -23,8 +23,6 @@
import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.synapse.MessageContext;
import org.apache.synapse.core.axis2.Axis2MessageContext;
-import org.apache.synapse.config.SynapseConfiguration;
-import org.apache.synapse.config.Property;
import org.apache.synapse.mediators.MediatorProperty;
import org.apache.synapse.mediators.TestUtils;
@@ -48,22 +46,22 @@
* property being searched does not exist in context, and lookup should go up into the config
* @throws Exception
*/
- public void testSetAndReadGlobalProperty() throws Exception {
+ /*TODO ACP public void testSetAndReadGlobalProperty() throws Exception {
MessageContext synCtx = TestUtils.getTestContext("<empty/>");
SynapseConfiguration synCfg = new SynapseConfiguration();
- Property prop = new Property();
- prop.setName("name");
- prop.setType(Property.VALUE_TYPE);
+ Entry prop = new Entry();
+ prop.setKey("name");
+ prop.setType(Entry.VALUE_TYPE);
prop.setValue("value");
- synCfg.addProperty("name", prop);
+ synCfg.addResource("name", prop);
synCtx.setConfiguration(synCfg);
assertTrue(
"value".equals(Axis2MessageContext.getStringValue(
new AXIOMXPath("synapse:get-property('name')"), synCtx)));
- }
+ }*/
public void testMediatorPropertiesLiteral() throws Exception {
Modified: webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java Mon Mar 5 23:52:29 2007
@@ -32,8 +32,6 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.rpc.receivers.RPCMessageReceiver;
-import org.apache.axis2.transport.http.SimpleHTTPServer;
-import org.apache.axis2.transport.nhttp.HttpCoreNIOListener;
import org.apache.axis2.transport.TransportListener;
import org.apache.axis2.engine.ListenerManager;
import org.apache.axis2.AxisFault;
Modified: webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/registry/url/SimpleURLRegistryTest.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/registry/url/SimpleURLRegistryTest.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/registry/url/SimpleURLRegistryTest.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/registry/url/SimpleURLRegistryTest.java Mon Mar 5 23:52:29 2007
@@ -20,7 +20,7 @@
package org.apache.synapse.registry.url;
import junit.framework.TestCase;
-import org.apache.synapse.config.Property;
+import org.apache.synapse.config.Entry;
import org.apache.synapse.registry.Registry;
import java.io.BufferedWriter;
@@ -41,20 +41,20 @@
Registry reg = new SimpleURLRegistry();
reg.addConfigProperty("root", "file:./");
reg.addConfigProperty("cachableDuration", "1500");
- Property prop = new Property();
- prop.setType(Property.DYNAMIC_TYPE);
+ Entry prop = new Entry();
+ prop.setType(Entry.REMOTE_ENTRY);
prop.setKey(FILE);
// initial load of file from registry
- assertEquals(TEXT_1, reg.getProperty(prop).toString());
+ assertEquals(TEXT_1, reg.getResource(prop).toString());
// sleep 1 sec
Thread.sleep(1000);
- assertEquals(TEXT_1, reg.getProperty(prop).toString());
+ assertEquals(TEXT_1, reg.getResource(prop).toString());
// sleep another 1 sec, has expired in cache, but content hasnt changed
Thread.sleep(1000);
- assertEquals(TEXT_1, reg.getProperty(prop).toString());
+ assertEquals(TEXT_1, reg.getResource(prop).toString());
// the renewed cache should be valid for another 1.5 secs
// change the file now and change next cache duration
@@ -62,15 +62,15 @@
reg.addConfigProperty("cachableDuration", "100");
// still cached content should be available and valid
- assertEquals(TEXT_1, reg.getProperty(prop).toString());
+ assertEquals(TEXT_1, reg.getResource(prop).toString());
// now sleep 1 sec, still cache should be valid
Thread.sleep(1000);
- assertEquals(TEXT_1, reg.getProperty(prop).toString());
+ assertEquals(TEXT_1, reg.getResource(prop).toString());
// sleep another 1 sec.. cache should expire and new content should be loaded
Thread.sleep(1000);
- assertEquals(TEXT_2, reg.getProperty(prop).toString());
+ assertEquals(TEXT_2, reg.getResource(prop).toString());
// change content back to original
writeToFile(TEXT_1);
@@ -78,7 +78,7 @@
// sleep for .5 sec, now the new content should be loaded as new expiry time
// is .1 sec
Thread.sleep(500);
- assertEquals(TEXT_1, reg.getProperty(prop).toString());
+ assertEquals(TEXT_1, reg.getResource(prop).toString());
}
public void tearDown() throws Exception {
Modified: webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java (original)
+++ webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java Mon Mar 5 23:52:29 2007
@@ -25,7 +25,7 @@
import org.apache.bsf.BSFManager;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.config.Property;
+import org.apache.synapse.config.Entry;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.mediators.AbstractMediator;
import org.apache.synapse.mediators.bsf.convertors.DefaultOMElementConvertor;
@@ -83,11 +83,11 @@
public synchronized BSFEngine getBSFEngine(SynapseConfiguration synapseConfig) {
- Property dp = synapseConfig.getPropertyObject(scriptKey);
+ Entry dp = synapseConfig.getEntryDefinition(scriptKey);
// boolean requiresRefresh = (dp != null) && (!dp.isCached() || dp.isExpired());
// if (bsfEngine == null || requiresRefresh) { TODO: sort out caching
if (bsfEngine == null) {
- OMElement el = (OMElement) synapseConfig.getProperty(scriptKey);
+ OMElement el = (OMElement) synapseConfig.getEntry(scriptKey);
String scriptSrc = el.getText();
String scriptName = dp.getSrc().toString();
this.bsfEngine = createBSFEngine(scriptName, scriptSrc);
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=515014&r1=515013&r2=515014
==============================================================================
--- 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 Mon Mar 5 23:52:29 2007
@@ -21,18 +21,17 @@
import java.util.Set;
import java.util.Stack;
-
-import javax.xml.stream.XMLStreamException;
-
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.RelatesTo;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.Mediator;
import org.apache.synapse.FaultHandler;
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;
/**
* ScriptMessageContext decorates the Synapse MessageContext adding methods to use the message payload XML in a way natural to the scripting language.
@@ -108,6 +107,10 @@
mc.setEnvironment(se);
}
+ public Object getLocalProperty(String key) {
+ return mc.getLocalProperty(key);
+ }
+
public Object getProperty(String key) {
return mc.getProperty(key);
}
@@ -118,6 +121,22 @@
public Set getPropertyKeySet() {
return mc.getPropertyKeySet();
+ }
+
+ public Mediator getMainSequence() {
+ return mc.getMainSequence();
+ }
+
+ public Mediator getFaultSequence() {
+ return mc.getFaultSequence();
+ }
+
+ public Mediator getSequence(String key) {
+ return mc.getSequence(key);
+ }
+
+ public Endpoint getEndpoint(String key) {
+ return mc.getEndpoint(key);
}
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=515014&r1=515013&r2=515014
==============================================================================
--- 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 Mon Mar 5 23:52:29 2007
@@ -27,13 +27,15 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.RelatesTo;
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.config.SynapseConfiguration;
import org.apache.synapse.core.SynapseEnvironment;
/**
* This delegates all method calls to thread specific MessageContext.
- *
+ *
* This is required for the InlineScriptMediator to enable concurrent requests to run against the same inline script. As there is a single BSFEngine
* holding the inline script fragment and the MessageContext is pre-registered in that BSFEngine means there is a single MessageContext instance
* shared over all requests. Using this class as the single pre-registered MessageContext enables delegating all the method calls to a thread specific
@@ -111,6 +113,10 @@
return getMC().getWSAMessageID();
}
+ public Object getLocalProperty(String key) {
+ return getMC().getLocalProperty(key);
+ }
+
public Object getProperty(String key) {
return getMC().getProperty(key);
}
@@ -119,6 +125,22 @@
return getMC().getPropertyKeySet();
}
+ public Mediator getMainSequence() {
+ return getMC().getMainSequence();
+ }
+
+ public Mediator getFaultSequence() {
+ return getMC().getFaultSequence();
+ }
+
+ public Mediator getSequence(String key) {
+ return getMC().getSequence(key);
+ }
+
+ public Endpoint getEndpoint(String key) {
+ return getMC().getEndpoint(key);
+ }
+
public RelatesTo getRelatesTo() {
return getMC().getRelatesTo();
}
@@ -175,14 +197,6 @@
getMC().setTracingState(tracingState);
}
- public Stack getFaultStack() {
- return getMC().getFaultStack();
- }
-
- public void pushFault(FaultHandler fault) {
- getMC().pushFault(fault);
- }
-
public void setDoingMTOM(boolean b) {
getMC().setDoingMTOM(b);
}
@@ -251,4 +265,11 @@
getMC().setWSAAction(actionURI);
}
+ public Stack getFaultStack() {
+ return getMC().getFaultStack();
+ }
+
+ public void pushFault(FaultHandler fault) {
+ getMC().pushFault(fault);
+ }
}
Modified: webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java (original)
+++ webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java Mon Mar 5 23:52:29 2007
@@ -27,7 +27,7 @@
import org.apache.synapse.Constants;
import org.apache.synapse.mediators.AbstractMediator;
import org.apache.synapse.config.Util;
-import org.apache.synapse.config.Property;
+import org.apache.synapse.config.Entry;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.GenericApplicationContext;
@@ -65,7 +65,7 @@
if (shouldTrace) {
trace.trace("Start : Spring mediator");
}
- Property dp = synCtx.getConfiguration().getPropertyObject(configKey);
+ Entry dp = synCtx.getConfiguration().getEntryDefinition(configKey);
// if the configKey refers to a dynamic property
if (dp != null && dp.isDynamic()) {
@@ -112,7 +112,7 @@
xbdr.setValidating(false);
xbdr.loadBeanDefinitions(new InputStreamResource(
Util.getStreamSource(
- synCtx.getConfiguration().getProperty(configKey)).getInputStream()));
+ synCtx.getConfiguration().getEntry(configKey)).getInputStream()));
appContext.refresh();
this.appContext = appContext;
}
Modified: webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java (original)
+++ webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java Mon Mar 5 23:52:29 2007
@@ -19,21 +19,19 @@
package org.apache.synapse.mediators.transform;
-import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
import org.apache.synapse.Constants;
import org.apache.synapse.config.Util;
-import org.apache.synapse.config.Property;
+import org.apache.synapse.config.Entry;
import org.apache.synapse.mediators.AbstractMediator;
import org.apache.synapse.mediators.MediatorProperty;
import org.jaxen.JaxenException;
@@ -143,7 +141,7 @@
}
// build transformer - if necessary
- Property dp = msgCtx.getConfiguration().getPropertyObject(xsltKey);
+ Entry dp = msgCtx.getConfiguration().getEntryDefinition(xsltKey);
// if the xsltKey refers to a dynamic property
if (dp != null && dp.isDynamic()) {
@@ -152,7 +150,7 @@
try {
transformer = TransformerFactory.newInstance().
newTransformer(Util.getStreamSource(
- msgCtx.getConfiguration().getProperty(xsltKey)
+ msgCtx.getConfiguration().getEntry(xsltKey)
));
} catch (TransformerConfigurationException e) {
handleException("Error creating XSLT transformer using : " + xsltKey, e);
@@ -168,7 +166,7 @@
transformer = TransformerFactory.newInstance().
newTransformer(
Util.getStreamSource(
- msgCtx.getConfiguration().getProperty(xsltKey)));
+ msgCtx.getConfiguration().getEntry(xsltKey)));
} catch (TransformerConfigurationException e) {
handleException("Error creating XSLT transformer using : " + xsltKey, e);
}
Modified: webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediator.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediator.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediator.java (original)
+++ webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediator.java Mon Mar 5 23:52:29 2007
@@ -29,7 +29,7 @@
import org.apache.synapse.SynapseException;
import org.apache.synapse.Constants;
import org.apache.synapse.config.Util;
-import org.apache.synapse.config.Property;
+import org.apache.synapse.config.Entry;
import org.apache.synapse.mediators.AbstractListMediator;
import org.apache.synapse.mediators.MediatorProperty;
import org.jaxen.JaxenException;
@@ -224,7 +224,7 @@
Iterator iter = schemaKeys.iterator();
while (iter.hasNext()) {
String propKey = (String) iter.next();
- Property dp = msgCtx.getConfiguration().getPropertyObject(propKey);
+ Entry dp = msgCtx.getConfiguration().getEntryDefinition(propKey);
if (dp != null && dp.isDynamic()) {
if (!dp.isCached() || dp.isExpired()) {
reCreate = true; // request re-initialization of Validator
@@ -259,7 +259,7 @@
while (iter.hasNext()) {
String propName = (String) iter.next();
sources[i++] = Util.getStreamSource(
- msgCtx.getConfiguration().getProperty(propName));
+ msgCtx.getConfiguration().getEntry(propName));
}
schema = factory.newSchema(sources);
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org