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 2006/08/08 10:29:35 UTC
svn commit: r429611 [2/3] - in /incubator/synapse/trunk/java:
modules/core/src/org/apache/synapse/ modules/core/src/org/apache/synapse/api/
modules/core/src/org/apache/synapse/config/
modules/core/src/org/apache/synapse/config/xml/ modules/core/src/org...
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SynapseMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SynapseMediatorFactory.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SynapseMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SynapseMediatorFactory.java Tue Aug 8 01:29:28 2006
@@ -16,13 +16,11 @@
package org.apache.synapse.config.xml;
-import javax.xml.namespace.QName;
-
-import org.apache.synapse.config.xml.Constants;
-import org.apache.synapse.api.Mediator;
-import org.apache.synapse.mediators.base.SynapseMediator;
import org.apache.axiom.om.OMElement;
-import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.synapse.Mediator;
+import org.apache.synapse.mediators.base.SynapseMediator;
+
+import javax.xml.namespace.QName;
/**
* Builds the main mediator (@see SynapseConfiguration) of the Synapse instance
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SynapseMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SynapseMediatorSerializer.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SynapseMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SynapseMediatorSerializer.java Tue Aug 8 01:29:28 2006
@@ -15,11 +15,11 @@
*/
package org.apache.synapse.config.xml;
+import org.apache.axiom.om.OMElement;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.synapse.api.Mediator;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.Mediator;
import org.apache.synapse.mediators.base.SynapseMediator;
/**
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/TryMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/TryMediatorFactory.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/TryMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/TryMediatorFactory.java Tue Aug 8 01:29:28 2006
@@ -15,12 +15,12 @@
*/
package org.apache.synapse.config.xml;
-import org.apache.synapse.api.Mediator;
-import org.apache.synapse.mediators.base.TryMediator;
-import org.apache.synapse.SynapseException;
import org.apache.axiom.om.OMElement;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.SynapseException;
+import org.apache.synapse.Mediator;
+import org.apache.synapse.mediators.base.TryMediator;
import javax.xml.namespace.QName;
import java.util.Iterator;
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/TryMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/TryMediatorSerializer.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/TryMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/TryMediatorSerializer.java Tue Aug 8 01:29:28 2006
@@ -15,11 +15,11 @@
*/
package org.apache.synapse.config.xml;
+import org.apache.axiom.om.OMElement;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.synapse.api.Mediator;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.Mediator;
import org.apache.synapse.mediators.base.TryMediator;
/**
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/XMLConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/XMLConfigurationBuilder.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/XMLConfigurationBuilder.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/XMLConfigurationBuilder.java Tue Aug 8 01:29:28 2006
@@ -15,28 +15,28 @@
*/
package org.apache.synapse.config.xml;
+import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.registry.Registry;
-import org.apache.synapse.core.axis2.ProxyService;
-import org.apache.synapse.config.SynapseConfiguration;
-import org.apache.synapse.config.Endpoint;
import org.apache.synapse.config.DynamicProperty;
+import org.apache.synapse.config.Endpoint;
+import org.apache.synapse.config.SynapseConfiguration;
+import org.apache.synapse.core.axis2.ProxyService;
import org.apache.synapse.mediators.base.SequenceMediator;
import org.apache.synapse.mediators.base.SynapseMediator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.registry.Registry;
-import javax.xml.stream.XMLStreamException;
import javax.xml.namespace.QName;
-import java.io.InputStream;
+import javax.xml.stream.XMLStreamException;
import java.io.IOException;
-import java.util.Iterator;
-import java.net.URL;
+import java.io.InputStream;
import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Iterator;
/**
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/XMLConfigurationSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/XMLConfigurationSerializer.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/XMLConfigurationSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/XMLConfigurationSerializer.java Tue Aug 8 01:29:28 2006
@@ -15,25 +15,23 @@
*/
package org.apache.synapse.config.xml;
-import org.apache.synapse.config.SynapseConfiguration;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.SynapseException;
import org.apache.synapse.config.DynamicProperty;
import org.apache.synapse.config.Endpoint;
+import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.core.axis2.ProxyService;
-import org.apache.synapse.SynapseException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMElement;
import javax.xml.stream.XMLStreamException;
-import java.io.FileInputStream;
import java.io.OutputStream;
-import java.io.FileOutputStream;
-import java.util.Iterator;
-import java.net.URL;
import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Iterator;
public class XMLConfigurationSerializer {
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/AnonymousServiceFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/AnonymousServiceFactory.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/AnonymousServiceFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/AnonymousServiceFactory.java Tue Aug 8 01:29:28 2006
@@ -15,14 +15,14 @@
*/
package org.apache.synapse.core.axis2;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.OutInAxisOperation;
import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.AxisFault;
-import org.apache.synapse.SynapseException;
-import org.apache.synapse.Constants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseException;
import javax.xml.namespace.QName;
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java Tue Aug 8 01:29:28 2006
@@ -31,10 +31,10 @@
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.util.UUIDGenerator;
import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.synapse.Constants;
-import org.apache.ws.policy.Policy;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.Constants;
+import org.apache.ws.policy.Policy;
import javax.xml.namespace.QName;
import java.util.ArrayList;
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2MessageContext.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2MessageContext.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2MessageContext.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2MessageContext.java Tue Aug 8 01:29:28 2006
@@ -15,21 +15,31 @@
*/
package org.apache.synapse.core.axis2;
-import org.apache.synapse.MessageContext;
-import org.apache.synapse.Constants;
-import org.apache.synapse.core.SynapseEnvironment;
-import org.apache.synapse.config.SynapseConfiguration;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.om.xpath.AXIOMXPath;
+import org.apache.axiom.om.impl.llom.OMTextImpl;
+import org.apache.axiom.om.impl.llom.OMElementImpl;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.RelatesTo;
-import org.apache.axis2.AxisFault;
-import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.synapse.Constants;
+import org.apache.synapse.MessageContext;
+import org.apache.synapse.SynapseException;
+import org.apache.synapse.mediators.GetPropertyFunction;
+import org.apache.synapse.config.SynapseConfiguration;
+import org.apache.synapse.core.SynapseEnvironment;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jaxen.SimpleFunctionContext;
+import org.jaxen.XPathFunctionContext;
+import org.jaxen.JaxenException;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Set;
+import java.util.*;
public class Axis2MessageContext implements MessageContext {
+ private static final Log log = LogFactory.getLog(Axis2MessageContext.class);
+
private SynapseConfiguration cfg = null;
private SynapseEnvironment env = null;
private Map properties = new HashMap();
@@ -212,4 +222,76 @@
response = resp.booleanValue();
}
+ /**
+ * Evaluates the given XPath expression against the SOAPEnvelope of the
+ * current message and returns a String representation of the result
+ * @param xpath the expression to evaluate
+ * @param synCtx the source message which holds the SOAP envelope
+ * @return a String representation of the result of evaluation
+ */
+ public static String getStringValue(AXIOMXPath xpath, MessageContext synCtx) {
+
+ if (xpath != null) {
+ try {
+ // create an instance of a synapse:get-property() function and set it to the xpath
+ GetPropertyFunction getPropertyFunc = new GetPropertyFunction();
+ getPropertyFunc.setSynCtx(synCtx);
+
+ // set function context into XPath
+ SimpleFunctionContext fc = new XPathFunctionContext();
+ fc.registerFunction(Constants.SYNAPSE_NAMESPACE, "get-property", getPropertyFunc);
+ xpath.setFunctionContext(fc);
+
+ // register namespace for XPath extension function
+ xpath.addNamespace("synapse", Constants.SYNAPSE_NAMESPACE);
+
+ } catch (JaxenException je) {
+ handleException("Error setting up the Synapse XPath " +
+ "extension function for XPath : " + xpath, je);
+ }
+
+ try {
+ Object result = xpath.evaluate(synCtx.getEnvelope());
+ StringBuffer textValue = new StringBuffer();
+
+ if (result instanceof List) {
+ Iterator iter = ((List) result).iterator();
+ while (iter.hasNext()) {
+ Object o = iter.next();
+ if (o instanceof OMTextImpl) {
+ textValue.append(((OMTextImpl) o).getText());
+ } else if (o instanceof OMElementImpl) {
+ textValue.append(((OMElementImpl) o).getText());
+ }
+ }
+ } else {
+ textValue.append(result.toString());
+ }
+ return textValue.toString();
+
+ } catch (JaxenException je) {
+ handleException("Evaluation of the XPath expression " + xpath.toString() +
+ " resulted in an error", je);
+ }
+ } else {
+ handleException("Invalid (null) XPath expression");
+ }
+ return null;
+ }
+
+ private static void handleException(String msg, Exception e) {
+ log.error(msg, e);
+ throw new SynapseException(msg, e);
+ }
+
+ private static void handleException(String msg) {
+ log.error(msg);
+ throw new SynapseException(msg);
+ }
+
+ public static void setErrorInformation(MessageContext synCtx, SynapseException e) {
+ synCtx.setProperty(Constants.ERROR_CODE, "00000"); //TODO not yet defined
+ synCtx.setProperty(Constants.ERROR_MESSAGE, e.getMessage());
+ synCtx.setProperty(Constants.ERROR_DETAIL, e.getStackTrace().toString());
+ }
}
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2MessageContextFinder.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2MessageContextFinder.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2MessageContextFinder.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2MessageContextFinder.java Tue Aug 8 01:29:28 2006
@@ -24,9 +24,8 @@
import org.apache.synapse.Constants;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.core.SynapseEnvironment;
-import org.apache.synapse.config.SynapseConfigurationBuilder;
import org.apache.synapse.config.SynapseConfiguration;
+import org.apache.synapse.core.SynapseEnvironment;
/**
* <p/>
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2Sender.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2Sender.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2Sender.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2Sender.java Tue Aug 8 01:29:28 2006
@@ -17,13 +17,13 @@
package org.apache.synapse.core.axis2;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.description.Parameter;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisEngine;
-import org.apache.synapse.Constants;
-import org.apache.synapse.SynapseException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseException;
import org.apache.ws.policy.Policy;
import java.util.Iterator;
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java Tue Aug 8 01:29:28 2006
@@ -16,11 +16,11 @@
package org.apache.synapse.core.axis2;
+import org.apache.axis2.engine.AxisConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.MessageContext;
import org.apache.synapse.core.SynapseEnvironment;
-import org.apache.axis2.engine.AxisConfiguration;
/**
* <p> This is the Axis2 implementation of the MessageContext
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/EmptyRMMessageReceiver.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/EmptyRMMessageReceiver.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/EmptyRMMessageReceiver.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/EmptyRMMessageReceiver.java Tue Aug 8 01:29:28 2006
@@ -15,14 +15,14 @@
*/
package org.apache.synapse.core.axis2;
-import org.apache.axis2.engine.MessageReceiver;
-import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.context.MessageContext;
+import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.engine.AxisEngine;
+import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.axiom.soap.SOAPEnvelope;
/*
*
*/
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyService.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyService.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyService.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyService.java Tue Aug 8 01:29:28 2006
@@ -15,28 +15,28 @@
*/
package org.apache.synapse.core.axis2;
-import org.apache.axis2.description.*;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.axis2.description.*;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.transport.njms.JMSConstants;
-import org.apache.synapse.SynapseException;
+import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseException;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.config.Util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ws.policy.util.PolicyReader;
-import org.apache.ws.policy.util.PolicyFactory;
import org.apache.ws.policy.Policy;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.ws.policy.util.PolicyFactory;
+import org.apache.ws.policy.util.PolicyReader;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.transform.stream.StreamSource;
-import java.net.URL;
import java.io.IOException;
+import java.net.URL;
import java.util.*;
/**
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java Tue Aug 8 01:29:28 2006
@@ -22,8 +22,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.Mediator;
import org.apache.synapse.config.Endpoint;
-import org.apache.synapse.api.Mediator;
/**
* This is the MessageReceiver set to act on behalf of Proxy services.
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseModule.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseModule.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseModule.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseModule.java Tue Aug 8 01:29:28 2006
@@ -15,17 +15,17 @@
*/
package org.apache.synapse.core.axis2;
-import org.apache.axis2.modules.Module;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.*;
-import org.apache.axis2.AxisFault;
import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.modules.Module;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.config.SynapseConfiguration;
-import org.apache.synapse.config.SynapseConfigurationBuilder;
import org.apache.synapse.Constants;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.config.SynapseConfiguration;
+import org.apache.synapse.config.SynapseConfigurationBuilder;
import javax.xml.namespace.QName;
import java.util.Iterator;
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseMustUnderstandHandler.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseMustUnderstandHandler.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseMustUnderstandHandler.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/core/axis2/SynapseMustUnderstandHandler.java Tue Aug 8 01:29:28 2006
@@ -15,11 +15,11 @@
*/
package org.apache.synapse.core.axis2;
-import org.apache.axis2.handlers.AbstractHandler;
-import org.apache.axis2.context.MessageContext;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.i18n.Messages;
-import org.apache.axiom.soap.*;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.handlers.AbstractHandler;
import java.util.Iterator;
/*
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/AbstractListMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/AbstractListMediator.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/AbstractListMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/AbstractListMediator.java Tue Aug 8 01:29:28 2006
@@ -16,11 +16,10 @@
package org.apache.synapse.mediators;
-import org.apache.synapse.MessageContext;
-import org.apache.synapse.api.Mediator;
-import org.apache.synapse.api.ListMediator;
-import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.MessageContext;
+import org.apache.synapse.Mediator;
import java.util.ArrayList;
import java.util.Iterator;
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/AbstractMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/AbstractMediator.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/AbstractMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/AbstractMediator.java Tue Aug 8 01:29:28 2006
@@ -15,9 +15,7 @@
*/
package org.apache.synapse.mediators;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.api.Mediator;
+import org.apache.synapse.Mediator;
/**
* This class is an abstract Mediator, that defines the logging and debugging
Added: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/FilterMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/FilterMediator.java?rev=429611&view=auto
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/FilterMediator.java (added)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/FilterMediator.java Tue Aug 8 01:29:28 2006
@@ -0,0 +1,20 @@
+package org.apache.synapse.mediators;
+
+import org.apache.synapse.MessageContext;
+
+/**
+ * The filter mediator is a list mediator, which executes the given (sub) list of mediators
+ * if the specified condition is satisfied
+ *
+ * @see FilterMediator#test(org.apache.synapse.MessageContext)
+ */
+public interface FilterMediator extends ListMediator {
+
+ /**
+ * Should return true if the sub/child mediators should execute. i.e. if the filter
+ * condition is satisfied
+ * @param synCtx
+ * @return true if the configured filter condition evaluates to true
+ */
+ public boolean test(MessageContext synCtx);
+}
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/GetPropertyFunction.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/GetPropertyFunction.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/GetPropertyFunction.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/GetPropertyFunction.java Tue Aug 8 01:29:28 2006
@@ -15,18 +15,18 @@
*/
package org.apache.synapse.mediators;
-import org.jaxen.Function;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.MessageContext;
+import org.apache.synapse.Constants;
import org.jaxen.Context;
+import org.jaxen.Function;
import org.jaxen.FunctionCallException;
import org.jaxen.Navigator;
import org.jaxen.function.StringFunction;
-import org.apache.synapse.MessageContext;
-import org.apache.synapse.HeaderType;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import java.util.List;
import java.util.Iterator;
+import java.util.List;
/**
* Implements the XPath extension function synapse:get-property(prop-name)
@@ -65,15 +65,15 @@
if (result != null) {
return result;
} else {
- if (HeaderType.STR_TO.equals(key) && synCtx.getTo() != null) {
+ if (Constants.HEADER_TO.equals(key) && synCtx.getTo() != null) {
return synCtx.getTo().getAddress();
- } else if (HeaderType.STR_FROM.equals(key) && synCtx.getFrom() != null) {
+ } else if (Constants.HEADER_FROM.equals(key) && synCtx.getFrom() != null) {
return synCtx.getFrom().getAddress();
- } else if (HeaderType.STR_ACTION.equals(key) && synCtx.getWSAAction() != null) {
+ } else if (Constants.HEADER_ACTION.equals(key) && synCtx.getWSAAction() != null) {
return synCtx.getWSAAction();
- } else if (HeaderType.STR_FAULT.equals(key) && synCtx.getFaultTo() != null) {
+ } else if (Constants.HEADER_FAULT.equals(key) && synCtx.getFaultTo() != null) {
return synCtx.getFaultTo().getAddress();
- } else if (HeaderType.STR_REPLY_TO.equals(key) && synCtx.getReplyTo() != null) {
+ } else if (Constants.HEADER_REPLY_TO.equals(key) && synCtx.getReplyTo() != null) {
return synCtx.getReplyTo().getAddress();
} else {
return null;
Added: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/ListMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/ListMediator.java?rev=429611&view=auto
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/ListMediator.java (added)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/ListMediator.java Tue Aug 8 01:29:28 2006
@@ -0,0 +1,68 @@
+/*
+* Copyright 2004,2005 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.synapse.mediators;
+
+import org.apache.synapse.Mediator;
+
+import java.util.List;
+
+/**
+ * The List mediator executes a given sequence/list of child mediators
+ */
+public interface ListMediator extends Mediator {
+
+ /**
+ * Appends the specified mediator to the end of this mediator's (children) list
+ * @param m the mediator to be added
+ * @return true (as per the general contract of the Collection.add method)
+ */
+ public boolean addChild(Mediator m);
+
+ /**
+ * Appends all of the mediators in the specified collection to the end of this mediator's (children)
+ * list, in the order that they are returned by the specified collection's iterator
+ * @param c the list of mediators to be added
+ * @return true if this list changed as a result of the call
+ */
+ public boolean addAll(List c);
+
+ /**
+ * Returns the mediator at the specified position
+ * @param pos index of mediator to return
+ * @return the mediator at the specified position in this list
+ */
+ public Mediator getChild(int pos);
+
+ /**
+ * Removes the first occurrence in this list of the specified mediator
+ * @param m mediator to be removed from this list, if present
+ * @return true if this list contained the specified mediator
+ */
+ public boolean removeChild(Mediator m);
+
+ /**
+ * Removes the mediator at the specified position in this list
+ * @param pos the index of the mediator to remove
+ * @return the mediator previously at the specified position
+ */
+ public Mediator removeChild(int pos);
+
+ /**
+ * Return the list of mediators of this List mediator instance
+ * @return the child/sub mediator list
+ */
+ public List getList();
+}
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/MediatorProperty.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/MediatorProperty.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/MediatorProperty.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/MediatorProperty.java Tue Aug 8 01:29:28 2006
@@ -15,10 +15,10 @@
*/
package org.apache.synapse.mediators;
-import org.apache.synapse.config.xml.Constants;
-import org.apache.synapse.Util;
-import org.apache.synapse.MessageContext;
import org.apache.axiom.om.xpath.AXIOMXPath;
+import org.apache.synapse.MessageContext;
+import org.apache.synapse.core.axis2.Axis2MessageContext;
+import org.apache.synapse.config.xml.Constants;
import javax.xml.namespace.QName;
@@ -65,7 +65,7 @@
}
public String getEvaluatedExpression(MessageContext synCtx) {
- return Util.getStringValue(expression, synCtx);
+ return Axis2MessageContext.getStringValue(expression, synCtx);
}
}
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/base/SequenceMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/base/SequenceMediator.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/base/SequenceMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/base/SequenceMediator.java Tue Aug 8 01:29:28 2006
@@ -15,13 +15,13 @@
*/
package org.apache.synapse.mediators.base;
-import org.apache.synapse.SynapseException;
-import org.apache.synapse.MessageContext;
-import org.apache.synapse.Util;
-import org.apache.synapse.api.Mediator;
-import org.apache.synapse.mediators.AbstractListMediator;
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.Mediator;
+import org.apache.synapse.core.axis2.Axis2MessageContext;
+import org.apache.synapse.mediators.AbstractListMediator;
/**
* The Sequence mediator either refers to a named Sequence mediator instance
@@ -60,7 +60,7 @@
if (errorHandler != null) {
// set exception information to message context
- Util.setErrorInformation(synCtx, e);
+ Axis2MessageContext.setErrorInformation(synCtx, e);
Mediator errHandler = synCtx.getConfiguration().getNamedSequence(errorHandler);
if (errHandler == null) {
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/base/SynapseMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/base/SynapseMediator.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/base/SynapseMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/base/SynapseMediator.java Tue Aug 8 01:29:28 2006
@@ -16,10 +16,10 @@
package org.apache.synapse.mediators.base;
-import org.apache.synapse.mediators.AbstractListMediator;
-import org.apache.synapse.MessageContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.MessageContext;
+import org.apache.synapse.mediators.AbstractListMediator;
/**
* The SynapseMediator is the "mainmediator" of the synapse engine. It is
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/base/TryMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/base/TryMediator.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/base/TryMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/base/TryMediator.java Tue Aug 8 01:29:28 2006
@@ -15,17 +15,17 @@
*/
package org.apache.synapse.mediators.base;
-import org.apache.synapse.mediators.AbstractListMediator;
-import org.apache.synapse.MessageContext;
-import org.apache.synapse.SynapseException;
-import org.apache.synapse.Util;
-import org.apache.synapse.api.Mediator;
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.Mediator;
+import org.apache.synapse.core.axis2.Axis2MessageContext;
+import org.apache.synapse.mediators.AbstractListMediator;
-import java.util.List;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
/**
* This is a ListMediator which is similar to a Java try-catch-finally but with a catch-all
@@ -49,7 +49,7 @@
} catch (SynapseException e) {
// set exception information to message context
- Util.setErrorInformation(synCtx, e);
+ Axis2MessageContext.setErrorInformation(synCtx, e);
Iterator it = errorHandlerMediators.iterator();
while (it.hasNext()) {
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/DropMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/DropMediator.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/DropMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/DropMediator.java Tue Aug 8 01:29:28 2006
@@ -16,10 +16,10 @@
package org.apache.synapse.mediators.builtin;
-import org.apache.synapse.MessageContext;
-import org.apache.synapse.mediators.AbstractMediator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.MessageContext;
+import org.apache.synapse.mediators.AbstractMediator;
/**
* Halts further processing/mediation of the current message. i.e. returns false
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/LogMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/LogMediator.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/LogMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/LogMediator.java Tue Aug 8 01:29:28 2006
@@ -17,15 +17,15 @@
package org.apache.synapse.mediators.builtin;
import org.apache.axiom.soap.SOAPHeader;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.synapse.MessageContext;
import org.apache.synapse.mediators.AbstractMediator;
import org.apache.synapse.mediators.MediatorProperty;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.ArrayList;
/**
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/PropertyMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/PropertyMediator.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/PropertyMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/PropertyMediator.java Tue Aug 8 01:29:28 2006
@@ -15,12 +15,12 @@
*/
package org.apache.synapse.mediators.builtin;
-import org.apache.synapse.mediators.AbstractMediator;
-import org.apache.synapse.MessageContext;
-import org.apache.synapse.Util;
import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.MessageContext;
+import org.apache.synapse.core.axis2.Axis2MessageContext;
+import org.apache.synapse.mediators.AbstractMediator;
/**
* The property mediator would save a named property as a local property
@@ -42,7 +42,7 @@
*/
public boolean mediate(MessageContext smc) {
log.debug("Set-Property mediator :: mediate()");
- String value = (getValue() != null ? getValue() : Util.getStringValue(getExpression(), smc));
+ String value = (getValue() != null ? getValue() : Axis2MessageContext.getStringValue(getExpression(), smc));
log.debug("Setting property : " + getName() + " = " + value);
smc.setProperty(getName(), value);
return true;
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/RMMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/RMMediator.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/RMMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/RMMediator.java Tue Aug 8 01:29:28 2006
@@ -15,26 +15,26 @@
*/
package org.apache.synapse.mediators.builtin;
-import org.apache.synapse.mediators.AbstractMediator;
-import org.apache.synapse.MessageContext;
-import org.apache.synapse.Constants;
-import org.apache.synapse.SynapseException;
-import org.apache.synapse.core.axis2.Axis2MessageContext;
-import org.apache.synapse.core.axis2.EmptyRMMessageReceiver;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisEngine;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.OperationContext;
import org.apache.axis2.context.OperationContextFactory;
import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.AxisModule;
import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.InOutAxisOperation;
-import org.apache.axis2.description.AxisModule;
-import org.apache.axis2.AxisFault;
+import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.util.Utils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.Constants;
+import org.apache.synapse.MessageContext;
+import org.apache.synapse.SynapseException;
+import org.apache.synapse.core.axis2.Axis2MessageContext;
+import org.apache.synapse.core.axis2.EmptyRMMessageReceiver;
+import org.apache.synapse.mediators.AbstractMediator;
import javax.xml.namespace.QName;
/*
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/SendMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/SendMediator.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/SendMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/builtin/SendMediator.java Tue Aug 8 01:29:28 2006
@@ -16,13 +16,13 @@
package org.apache.synapse.mediators.builtin;
-import org.apache.synapse.MessageContext;
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Constants;
+import org.apache.synapse.MessageContext;
import org.apache.synapse.config.Endpoint;
import org.apache.synapse.mediators.AbstractMediator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.axis2.addressing.EndpointReference;
import java.util.ArrayList;
import java.util.List;
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/ext/ClassMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/ext/ClassMediator.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/ext/ClassMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/ext/ClassMediator.java Tue Aug 8 01:29:28 2006
@@ -19,15 +19,15 @@
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.Util;
-import org.apache.synapse.api.Mediator;
+import org.apache.synapse.Mediator;
+import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.mediators.AbstractMediator;
import org.apache.synapse.mediators.MediatorProperty;
-import java.util.List;
+import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Iterator;
-import java.lang.reflect.Method;
+import java.util.List;
/**
* The class mediator delegates the mediation to a new instance of a specified class. The specified class
@@ -79,7 +79,7 @@
String mName = "set" + Character.toUpperCase(mProp.getName().charAt(0)) + mProp.getName().substring(1);
String value = (mProp.getValue() != null ?
mProp.getValue() :
- Util.getStringValue(mProp.getExpression(), synCtx));
+ Axis2MessageContext.getStringValue(mProp.getExpression(), synCtx));
try {
Method method = m.getClass().getMethod(mName, new Class[] {String.class});
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/filters/FilterMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/filters/FilterMediator.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/filters/FilterMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/filters/FilterMediator.java Tue Aug 8 01:29:28 2006
@@ -17,11 +17,11 @@
package org.apache.synapse.mediators.filters;
import org.apache.axiom.om.xpath.AXIOMXPath;
-import org.apache.synapse.Util;
-import org.apache.synapse.MessageContext;
-import org.apache.synapse.mediators.AbstractListMediator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.MessageContext;
+import org.apache.synapse.core.axis2.Axis2MessageContext;
+import org.apache.synapse.mediators.AbstractListMediator;
import org.jaxen.JaxenException;
import java.util.regex.Pattern;
@@ -30,7 +30,7 @@
* The filter mediator combines the regex and xpath filtering functionality. If an xpath
* is set, it is evaluated; else the given regex is evaluated against the source xpath.
*/
-public class FilterMediator extends AbstractListMediator implements org.apache.synapse.api.FilterMediator {
+public class FilterMediator extends AbstractListMediator implements org.apache.synapse.mediators.FilterMediator {
private static final Log log = LogFactory.getLog(FilterMediator.class);
private AXIOMXPath source = null;
@@ -69,7 +69,7 @@
} else if (source != null && regex != null) {
log.debug("Evaluating regular expression : " + regex.pattern() + " against source : " + source);
- return regex.matcher(Util.getStringValue(source, synCtx)).matches();
+ return regex.matcher(Axis2MessageContext.getStringValue(source, synCtx)).matches();
} else {
log.error("Invalid configuration specified");
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/filters/InMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/filters/InMediator.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/filters/InMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/filters/InMediator.java Tue Aug 8 01:29:28 2006
@@ -26,7 +26,7 @@
*
* @see org.apache.synapse.MessageContext#isResponse()
*/
-public class InMediator extends AbstractListMediator implements org.apache.synapse.api.FilterMediator {
+public class InMediator extends AbstractListMediator implements org.apache.synapse.mediators.FilterMediator {
private static final Log log = LogFactory.getLog(InMediator.class);
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/filters/OutMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/filters/OutMediator.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/filters/OutMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/filters/OutMediator.java Tue Aug 8 01:29:28 2006
@@ -26,7 +26,7 @@
*
* @see org.apache.synapse.MessageContext#isResponse()
*/
-public class OutMediator extends AbstractListMediator implements org.apache.synapse.api.FilterMediator {
+public class OutMediator extends AbstractListMediator implements org.apache.synapse.mediators.FilterMediator {
private static final Log log = LogFactory.getLog(OutMediator.class);
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/filters/SwitchCaseMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/filters/SwitchCaseMediator.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/filters/SwitchCaseMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/filters/SwitchCaseMediator.java Tue Aug 8 01:29:28 2006
@@ -15,12 +15,12 @@
*/
package org.apache.synapse.mediators.filters;
-import org.apache.synapse.mediators.AbstractListMediator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.mediators.AbstractListMediator;
-import java.util.regex.Pattern;
import java.util.List;
+import java.util.regex.Pattern;
/**
* A SwitchCaseMediator is a list mediator which has a regex that is matched by
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/filters/SwitchMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/filters/SwitchMediator.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/filters/SwitchMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/filters/SwitchMediator.java Tue Aug 8 01:29:28 2006
@@ -15,16 +15,16 @@
*/
package org.apache.synapse.mediators.filters;
-import org.apache.synapse.mediators.AbstractMediator;
-import org.apache.synapse.MessageContext;
-import org.apache.synapse.Util;
+import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.axiom.om.xpath.AXIOMXPath;
+import org.apache.synapse.MessageContext;
+import org.apache.synapse.core.axis2.Axis2MessageContext;
+import org.apache.synapse.mediators.AbstractMediator;
-import java.util.List;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
/**
* The switch mediator implements the functionality of the "switch" contruct. It first
@@ -51,7 +51,7 @@
public boolean mediate(MessageContext synCtx) {
log.debug("Switch mediator :: mediate()");
- String sourceText = Util.getStringValue(source, synCtx);
+ String sourceText = Axis2MessageContext.getStringValue(source, synCtx);
log.debug("Applying switch case regex patterns against evaluated source value : " + sourceText);
Iterator iter = cases.iterator();
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/transform/FaultMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/transform/FaultMediator.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/transform/FaultMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/transform/FaultMediator.java Tue Aug 8 01:29:28 2006
@@ -20,15 +20,14 @@
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.axiom.soap.*;
-import org.apache.axis2.addressing.EndpointReference;
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.SynapseException;
import org.apache.synapse.MessageContext;
-import org.apache.synapse.Util;
+import org.apache.synapse.SynapseException;
+import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.mediators.AbstractMediator;
-import org.jaxen.JaxenException;
import javax.xml.namespace.QName;
import java.net.URI;
@@ -157,7 +156,7 @@
} else if (faultCodeValue != null) {
fault_code = faultCodeValue;
} else {
- fault_code = QName.valueOf(Util.getStringValue(faultCodeExpr, synCtx));
+ fault_code = QName.valueOf(Axis2MessageContext.getStringValue(faultCodeExpr, synCtx));
}
SOAPFaultCode code = factory.createSOAPFaultCode();
@@ -174,7 +173,7 @@
} else if (faultReasonValue != null) {
reasonString = faultReasonValue;
} else {
- reasonString = Util.getStringValue(faultReasonExpr, synCtx);
+ reasonString = Axis2MessageContext.getStringValue(faultReasonExpr, synCtx);
}
SOAPFaultReason reason = factory.createSOAPFaultReason();
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/transform/HeaderMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/transform/HeaderMediator.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/transform/HeaderMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/mediators/transform/HeaderMediator.java Tue Aug 8 01:29:28 2006
@@ -15,13 +15,13 @@
*/
package org.apache.synapse.mediators.transform;
-import org.apache.synapse.mediators.AbstractMediator;
-import org.apache.synapse.HeaderType;
-import org.apache.synapse.Util;
-import org.apache.synapse.MessageContext;
import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.*;
+import org.apache.synapse.core.axis2.Axis2MessageContext;
+import org.apache.synapse.mediators.AbstractMediator;
+import org.apache.axis2.addressing.EndpointReference;
/**
* The header mediator is able to set a given value as a SOAP header, or remove a given
@@ -47,8 +47,6 @@
private int action = ACTION_SET;
/** An expression which should be evaluated, and the result set as the header value */
private AXIOMXPath expression = null;
- /** The header type to which this mediator applies to */
- private HeaderType headerType = new HeaderType();
/**
* Sets/Removes a SOAP header on the current message
@@ -61,13 +59,40 @@
if (action == ACTION_SET) {
String value = (getValue() != null ? getValue() :
- Util.getStringValue(getExpression(), synCtx));
- log.debug("Setting header : " + headerType.getHeaderType() + " to : " + value);
- headerType.setHeader(synCtx, value);
+ Axis2MessageContext.getStringValue(getExpression(), synCtx));
+
+ log.debug("Setting header : " + name + " to : " + value);
+
+ if (Constants.HEADER_TO.equals(name)) {
+ synCtx.setTo(new EndpointReference(value));
+ } else if (Constants.HEADER_FROM.equals(name)){
+ synCtx.setFrom(new EndpointReference(value));
+ } else if (Constants.HEADER_ACTION.equals(name)) {
+ synCtx.setWSAAction(value);
+ } else if (Constants.HEADER_FAULT.equals(name)) {
+ synCtx.setFaultTo(new EndpointReference(value));
+ } else if (Constants.HEADER_REPLY_TO.equals(name)) {
+ synCtx.setReplyTo(new EndpointReference(value));
+ } else {
+ handleException("Unsupported header : " + name);
+ }
} else {
- log.debug("Removing header : " + headerType.getHeaderType() + " from current message");
- headerType.removeHeader(synCtx);
+ log.debug("Removing header : " + name + " from current message");
+
+ if (Constants.HEADER_TO.equals(name)) {
+ synCtx.setTo(null);
+ } else if (Constants.HEADER_FROM.equals(name)){
+ synCtx.setFrom(null);
+ } else if (Constants.HEADER_ACTION.equals(name)) {
+ synCtx.setWSAAction(null);
+ } else if (Constants.HEADER_FAULT.equals(name)) {
+ synCtx.setFaultTo(null);
+ } else if (Constants.HEADER_REPLY_TO.equals(name)) {
+ synCtx.setReplyTo(null);
+ } else {
+ handleException("Unsupported header : " + name);
+ }
}
return true;
}
@@ -86,7 +111,6 @@
public void setName(String name) {
this.name = name;
- this.headerType.setHeaderType(name);
}
public String getValue() {
@@ -103,5 +127,10 @@
public void setExpression(AXIOMXPath expression) {
this.expression = expression;
+ }
+
+ private void handleException(String msg) {
+ log.error(msg);
+ throw new SynapseException(msg);
}
}
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/metrics/GlobalRequestCountHandler.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/metrics/GlobalRequestCountHandler.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/metrics/GlobalRequestCountHandler.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/metrics/GlobalRequestCountHandler.java Tue Aug 8 01:29:28 2006
@@ -15,9 +15,9 @@
*/
package org.apache.synapse.metrics;
-import org.apache.axis2.handlers.AbstractHandler;
-import org.apache.axis2.context.MessageContext;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.handlers.AbstractHandler;
/*
* This information is published using WS-Management.
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/metrics/MetricsAggregatorModule.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/metrics/MetricsAggregatorModule.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/metrics/MetricsAggregatorModule.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/metrics/MetricsAggregatorModule.java Tue Aug 8 01:29:28 2006
@@ -15,13 +15,13 @@
*/
package org.apache.synapse.metrics;
-import org.apache.axis2.modules.Module;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.description.AxisModule;
import org.apache.axis2.description.AxisDescription;
+import org.apache.axis2.description.AxisModule;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.AxisFault;
import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.modules.Module;
/*
*
*/
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/AbstractRegistry.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/AbstractRegistry.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/AbstractRegistry.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/AbstractRegistry.java Tue Aug 8 01:29:28 2006
@@ -18,13 +18,12 @@
import org.apache.axiom.om.OMNode;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.config.XMLToObjectMapper;
import org.apache.synapse.config.DynamicProperty;
+import org.apache.synapse.config.XMLToObjectMapper;
import java.net.URI;
-import java.util.List;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
/**
* Implements the core Registry lookup algorithm
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/Registry.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/Registry.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/Registry.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/Registry.java Tue Aug 8 01:29:28 2006
@@ -18,7 +18,6 @@
import org.apache.axiom.om.OMNode;
import org.apache.synapse.config.DynamicProperty;
-import java.util.List;
import java.util.Map;
/**
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/url/SimpleURLRegistry.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/url/SimpleURLRegistry.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/url/SimpleURLRegistry.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/registry/url/SimpleURLRegistry.java Tue Aug 8 01:29:28 2006
@@ -15,20 +15,20 @@
*/
package org.apache.synapse.registry.url;
-import org.apache.synapse.registry.Registry;
-import org.apache.synapse.registry.AbstractRegistry;
-import org.apache.synapse.registry.RegistryEntry;
-import org.apache.synapse.SynapseException;
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.synapse.SynapseException;
+import org.apache.synapse.registry.AbstractRegistry;
+import org.apache.synapse.registry.Registry;
+import org.apache.synapse.registry.RegistryEntry;
-import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
-import java.net.*;
+import javax.xml.stream.XMLStreamReader;
import java.io.IOException;
+import java.net.*;
/**
* A Simple HTTP GET based registry which will work with a Web Server / WebDAV
@@ -95,11 +95,17 @@
}
public String getRoot() {
- return (String) properties.get("root");
+ String root = (String) properties.get("root");
+ if (root == null) {
+ return "";
+ } else {
+ return root;
+ }
}
public long getCachableDuration() {
- return Long.parseLong((String) properties.get("cachableDuration"));
+ String cachableDuration = (String) properties.get("cachableDuration");
+ return cachableDuration == null ? 1500 : Long.parseLong(cachableDuration);
}
private void handleException(String msg, Exception e) {
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/TestMessageContext.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/TestMessageContext.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/TestMessageContext.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/TestMessageContext.java Tue Aug 8 01:29:28 2006
@@ -15,18 +15,17 @@
*/
package org.apache.synapse;
-import org.apache.synapse.config.SynapseConfiguration;
-import org.apache.synapse.core.SynapseEnvironment;
-import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.soap.SOAP11Constants;
+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.axis2.AxisFault;
+import org.apache.synapse.config.SynapseConfiguration;
+import org.apache.synapse.core.SynapseEnvironment;
-import java.util.Map;
import java.util.HashMap;
-import java.util.Iterator;
+import java.util.Map;
import java.util.Set;
public class TestMessageContext implements MessageContext {
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/TestMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/TestMediator.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/TestMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/TestMediator.java Tue Aug 8 01:29:28 2006
@@ -15,8 +15,8 @@
*/
package org.apache.synapse.mediators;
-import org.apache.synapse.api.Mediator;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.Mediator;
/**
* Test mediator class.
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/TestUtils.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/TestUtils.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/TestUtils.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/TestUtils.java Tue Aug 8 01:29:28 2006
@@ -15,22 +15,21 @@
*/
package org.apache.synapse.mediators;
-import org.apache.synapse.TestMessageContext;
-import org.apache.synapse.MessageContext;
-import org.apache.synapse.registry.url.SimpleURLRegistry;
-import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.synapse.core.axis2.Axis2SynapseEnvironment;
-import org.apache.synapse.core.axis2.Axis2MessageContext;
-import org.apache.synapse.core.SynapseEnvironment;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.synapse.MessageContext;
+import org.apache.synapse.TestMessageContext;
import org.apache.synapse.config.SynapseConfiguration;
+import org.apache.synapse.core.SynapseEnvironment;
+import org.apache.synapse.core.axis2.Axis2MessageContext;
+import org.apache.synapse.core.axis2.Axis2SynapseEnvironment;
+import org.apache.synapse.registry.url.SimpleURLRegistry;
-import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
import java.io.StringReader;
-import java.util.List;
import java.util.Iterator;
import java.util.Map;
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/base/SequenceMediatorTest.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/base/SequenceMediatorTest.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/base/SequenceMediatorTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/base/SequenceMediatorTest.java Tue Aug 8 01:29:28 2006
@@ -16,12 +16,12 @@
package org.apache.synapse.mediators.base;
import junit.framework.TestCase;
-import org.apache.synapse.mediators.TestMediator;
-import org.apache.synapse.mediators.TestMediateHandler;
-import org.apache.synapse.mediators.TestUtils;
+import org.apache.synapse.Constants;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.Constants;
+import org.apache.synapse.mediators.TestMediateHandler;
+import org.apache.synapse.mediators.TestMediator;
+import org.apache.synapse.mediators.TestUtils;
public class SequenceMediatorTest extends TestCase {
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/base/TryMediatorTest.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/base/TryMediatorTest.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/base/TryMediatorTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/base/TryMediatorTest.java Tue Aug 8 01:29:28 2006
@@ -16,11 +16,11 @@
package org.apache.synapse.mediators.base;
import junit.framework.TestCase;
-import org.apache.synapse.mediators.TestMediator;
-import org.apache.synapse.mediators.TestMediateHandler;
-import org.apache.synapse.mediators.TestUtils;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.mediators.TestMediateHandler;
+import org.apache.synapse.mediators.TestMediator;
+import org.apache.synapse.mediators.TestUtils;
public class TryMediatorTest extends TestCase {
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/PropertyMediatorTest.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/PropertyMediatorTest.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/PropertyMediatorTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/PropertyMediatorTest.java Tue Aug 8 01:29:28 2006
@@ -16,12 +16,12 @@
package org.apache.synapse.mediators.builtin;
import junit.framework.TestCase;
+import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.synapse.MessageContext;
-import org.apache.synapse.Util;
+import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.config.SynapseConfiguration;
-import org.apache.synapse.mediators.TestUtils;
import org.apache.synapse.mediators.MediatorProperty;
-import org.apache.axiom.om.xpath.AXIOMXPath;
+import org.apache.synapse.mediators.TestUtils;
public class PropertyMediatorTest extends TestCase {
@@ -35,7 +35,7 @@
propMediator.mediate(synCtx);
assertTrue(
- "value".equals(Util.getStringValue(
+ "value".equals(Axis2MessageContext.getStringValue(
new AXIOMXPath("synapse:get-property('name')"), synCtx)));
}
@@ -52,7 +52,7 @@
synCtx.setConfiguration(synCfg);
assertTrue(
- "value".equals(Util.getStringValue(
+ "value".equals(Axis2MessageContext.getStringValue(
new AXIOMXPath("synapse:get-property('name')"), synCtx)));
}
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/ext/ClassMediatorTest.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/ext/ClassMediatorTest.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/ext/ClassMediatorTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/ext/ClassMediatorTest.java Tue Aug 8 01:29:28 2006
@@ -16,9 +16,9 @@
package org.apache.synapse.mediators.ext;
import junit.framework.TestCase;
+import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.synapse.TestMessageContext;
import org.apache.synapse.mediators.MediatorProperty;
-import org.apache.axiom.om.xpath.AXIOMXPath;
/**
* Tests the class mediator instantiation and setting of literal and
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/ext/ClassMediatorTestMediator.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/ext/ClassMediatorTestMediator.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/ext/ClassMediatorTestMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/ext/ClassMediatorTestMediator.java Tue Aug 8 01:29:28 2006
@@ -15,8 +15,8 @@
*/
package org.apache.synapse.mediators.ext;
-import org.apache.synapse.api.Mediator;
import org.apache.synapse.MessageContext;
+import org.apache.synapse.Mediator;
/**
* Since the class mediator always "instantiates" a new instance of a class
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/filters/FilterMediatorTest.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/filters/FilterMediatorTest.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/filters/FilterMediatorTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/filters/FilterMediatorTest.java Tue Aug 8 01:29:28 2006
@@ -16,11 +16,11 @@
package org.apache.synapse.mediators.filters;
import junit.framework.TestCase;
+import org.apache.axiom.om.xpath.AXIOMXPath;
+import org.apache.synapse.MessageContext;
import org.apache.synapse.mediators.TestMediateHandler;
import org.apache.synapse.mediators.TestMediator;
import org.apache.synapse.mediators.TestUtils;
-import org.apache.synapse.MessageContext;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import java.util.regex.Pattern;
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/filters/SwitchMediatorTest.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/filters/SwitchMediatorTest.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/filters/SwitchMediatorTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/filters/SwitchMediatorTest.java Tue Aug 8 01:29:28 2006
@@ -16,15 +16,15 @@
package org.apache.synapse.mediators.filters;
import junit.framework.TestCase;
+import org.apache.axiom.om.xpath.AXIOMXPath;
+import org.apache.synapse.MessageContext;
+import org.apache.synapse.Mediator;
import org.apache.synapse.mediators.TestMediateHandler;
import org.apache.synapse.mediators.TestMediator;
import org.apache.synapse.mediators.TestUtils;
-import org.apache.synapse.MessageContext;
-import org.apache.synapse.api.Mediator;
-import org.apache.axiom.om.xpath.AXIOMXPath;
-import java.util.regex.Pattern;
import java.util.Arrays;
+import java.util.regex.Pattern;
public class SwitchMediatorTest extends TestCase {
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/transform/FaultMediatorTest.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/transform/FaultMediatorTest.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/transform/FaultMediatorTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/transform/FaultMediatorTest.java Tue Aug 8 01:29:28 2006
@@ -16,14 +16,12 @@
package org.apache.synapse.mediators.transform;
import junit.framework.TestCase;
-
-import javax.xml.namespace.QName;
-
-import org.apache.synapse.mediators.TestUtils;
-import org.apache.synapse.MessageContext;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFault;
+import org.apache.synapse.MessageContext;
+import org.apache.synapse.mediators.TestUtils;
+import javax.xml.namespace.QName;
import java.net.URI;
public class FaultMediatorTest extends TestCase {
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/transform/HeaderMediatorTest.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/transform/HeaderMediatorTest.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/transform/HeaderMediatorTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/transform/HeaderMediatorTest.java Tue Aug 8 01:29:28 2006
@@ -16,10 +16,10 @@
package org.apache.synapse.mediators.transform;
import junit.framework.TestCase;
+import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.synapse.MessageContext;
-import org.apache.synapse.HeaderType;
+import org.apache.synapse.Constants;
import org.apache.synapse.mediators.TestUtils;
-import org.apache.axiom.om.xpath.AXIOMXPath;
public class HeaderMediatorTest extends TestCase {
@@ -28,7 +28,7 @@
public void testSimpleHeaderSetAndRemove() throws Exception {
HeaderMediator headerMediator = new HeaderMediator();
- headerMediator.setName(HeaderType.STR_TO);
+ headerMediator.setName(Constants.HEADER_TO);
headerMediator.setValue(TEST_HEADER);
// invoke transformation, with static enveope
@@ -47,7 +47,7 @@
public void testSimpleHeaderXPathSetAndRemove() throws Exception {
HeaderMediator headerMediator = new HeaderMediator();
- headerMediator.setName(HeaderType.STR_TO);
+ headerMediator.setName(Constants.HEADER_TO);
headerMediator.setExpression(new AXIOMXPath("concat('http://','server','/path')"));
// invoke transformation, with static enveope
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/n2n/SynapseCommodityServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/n2n/SynapseCommodityServiceTest.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/n2n/SynapseCommodityServiceTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/n2n/SynapseCommodityServiceTest.java Tue Aug 8 01:29:28 2006
@@ -16,20 +16,20 @@
package org.apache.synapse.n2n;
import junit.framework.TestCase;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.client.Options;
+import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.rpc.receivers.RPCMessageReceiver;
import org.apache.axis2.transport.http.SimpleHTTPServer;
-import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.client.Options;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.synapse.utils.Services;
import org.apache.synapse.Constants;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMFactory;
+import org.apache.synapse.utils.Services;
import javax.xml.namespace.QName;
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/registry/url/SimpleURLRegistryTest.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/registry/url/SimpleURLRegistryTest.java?rev=429611&r1=429610&r2=429611&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/registry/url/SimpleURLRegistryTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/registry/url/SimpleURLRegistryTest.java Tue Aug 8 01:29:28 2006
@@ -16,13 +16,12 @@
package org.apache.synapse.registry.url;
import junit.framework.TestCase;
+import org.apache.synapse.config.DynamicProperty;
+import org.apache.synapse.registry.Registry;
-import java.io.File;
import java.io.BufferedWriter;
+import java.io.File;
import java.io.FileWriter;
-
-import org.apache.synapse.registry.Registry;
-import org.apache.synapse.config.DynamicProperty;
public class SimpleURLRegistryTest extends TestCase {
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org