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 [3/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/extensions/src/test/java/org/apache/synapse/TestMessageContext.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java (original)
+++ webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java 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,6 +38,8 @@
private Map properties = new HashMap();
+ private Map localEntries = new HashMap();
+
private SynapseConfiguration synCfg = null;
SOAPEnvelope envelope = null;
@@ -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)
@@ -183,7 +234,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) {
@@ -219,5 +271,13 @@
}
public void setSynapseContext(MessageContext env) {
+ }
+
+ public Stack getFaultStack() {
+ return null;
+ }
+
+ public void pushFault(FaultHandler fault) {
+ return;
}
}
Modified: webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/TestUtils.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/TestUtils.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/TestUtils.java (original)
+++ webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/TestUtils.java 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;
@@ -36,7 +35,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;
@@ -50,13 +49,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);
@@ -81,13 +80,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/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactoryTest.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactoryTest.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactoryTest.java (original)
+++ webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactoryTest.java Mon Mar 5 23:52:29 2007
@@ -30,7 +30,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.synapse.Mediator;
import org.apache.synapse.MessageContext;
-import org.apache.synapse.config.Property;
+import org.apache.synapse.config.Entry;
import org.apache.synapse.mediators.TestUtils;
public class ScriptMediatorFactoryTest extends TestCase {
@@ -57,7 +57,7 @@
}
public void testRegPropMediatorFactory() throws Exception {
- Property prop = new Property();
+ Entry prop = new Entry();
prop.setValue(MY_MEDIATOR);
prop.setSrc(new URL("http://MyMediator.js"));
Map props = new HashMap();
@@ -70,7 +70,7 @@
}
public void testRegPropWithFunctionMediatorFactory() throws Exception {
- Property prop = new Property();
+ Entry prop = new Entry();
prop.setValue(MY_MEDIATOR_FOO_FUNC);
prop.setSrc(new URL("http://MyFooMediator.js"));
Map props = new HashMap();
Modified: webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorTest.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorTest.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorTest.java (original)
+++ webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorTest.java Mon Mar 5 23:52:29 2007
@@ -27,7 +27,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.synapse.MessageContext;
-import org.apache.synapse.config.Property;
+import org.apache.synapse.config.Entry;
import org.apache.synapse.mediators.TestUtils;
import org.apache.synapse.mediators.bsf.convertors.DefaultOMElementConvertor;
import org.apache.synapse.mediators.bsf.convertors.JSOMElementConvertor;
@@ -47,7 +47,7 @@
public void testTrueMediator() throws Exception {
- Property prop = new Property();
+ Entry prop = new Entry();
prop.setValue(TRUE_MEDIATOR);
prop.setSrc(new URL("http://MyMediator.js"));
Map props = new HashMap();
@@ -59,7 +59,7 @@
}
public void testFalseMediator() throws Exception {
- Property prop = new Property();
+ Entry prop = new Entry();
prop.setValue(FALSE_MEDIATOR);
prop.setSrc(new URL("http://MyFooMediator.js"));
Map props = new HashMap();
@@ -72,7 +72,7 @@
public void testXMLMediator() throws Exception {
- Property prop = new Property();
+ Entry prop = new Entry();
prop.setValue(XML_MEDIATOR);
prop.setSrc(new URL("http://MyFooMediator.js"));
Map props = new HashMap();
Modified: webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/spring/SpringMediatorTest.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/spring/SpringMediatorTest.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/spring/SpringMediatorTest.java (original)
+++ webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/spring/SpringMediatorTest.java Mon Mar 5 23:52:29 2007
@@ -39,7 +39,7 @@
MessageContext msgCtx = TestUtils.getTestContext("<dummy/>");
msgCtx.setConfiguration(
SynapseConfigurationBuilder.getConfiguration("./../../repository/conf/sample/resources/spring/synapse_spring_unittest.xml"));
- msgCtx.getConfiguration().getMainMediator().mediate(msgCtx);
+ msgCtx.getMainSequence().mediate(msgCtx);
assertEquals(TestMediateHandlerImpl.invokeCount, 202);
}
Modified: webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java (original)
+++ webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java Mon Mar 5 23:52:29 2007
@@ -25,10 +25,8 @@
import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.synapse.mediators.TestUtils;
import org.apache.synapse.mediators.transform.XSLTMediator;
-import org.apache.synapse.config.Property;
+import org.apache.synapse.config.Entry;
import org.apache.synapse.MessageContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.util.HashMap;
import java.util.Map;
@@ -63,8 +61,8 @@
transformMediator.setXsltKey("xslt-key");
Map props = new HashMap();
- Property prop = new Property();
- prop.setType(Property.DYNAMIC_TYPE);
+ Entry prop = new Entry();
+ prop.setType(Entry.REMOTE_ENTRY);
prop.setKey("file:./../../repository/conf/sample/resources/transform/transform_unittest.xslt");
props.put("xslt-key", prop);
@@ -78,11 +76,11 @@
OMElement getQuoteElem = (OMElement) body.getFirstOMChild().getNextOMSibling();
assertTrue("GetQuote".equals(getQuoteElem.getLocalName()));
- assertTrue("http://www.webserviceX.NET/".equals(getQuoteElem.getNamespace().getName()));
+ assertTrue("http://www.webserviceX.NET/".equals(getQuoteElem.getNamespace().getNamespaceURI()));
OMElement symbolElem = getQuoteElem.getFirstElement();
assertTrue("symbol".equals(symbolElem.getLocalName()));
- assertTrue("http://www.webserviceX.NET/".equals(symbolElem.getNamespace().getName()));
+ assertTrue("http://www.webserviceX.NET/".equals(symbolElem.getNamespace().getNamespaceURI()));
assertTrue("String".equals(symbolElem.getText()));
} else {
@@ -103,8 +101,8 @@
transformMediator.setXsltKey("xslt-key");
Map props = new HashMap();
- Property prop = new Property();
- prop.setType(Property.DYNAMIC_TYPE);
+ Entry prop = new Entry();
+ prop.setType(Entry.REMOTE_ENTRY);
prop.setKey("file:./../../repository/conf/sample/resources/transform/transform_unittest.xslt");
props.put("xslt-key", prop);
@@ -118,11 +116,11 @@
OMElement getQuoteElem = (OMElement) body.getFirstOMChild().getNextOMSibling();
assertTrue("GetQuote".equals(getQuoteElem.getLocalName()));
- assertTrue("http://www.webserviceX.NET/".equals(getQuoteElem.getNamespace().getName()));
+ assertTrue("http://www.webserviceX.NET/".equals(getQuoteElem.getNamespace().getNamespaceURI()));
OMElement symbolElem = getQuoteElem.getFirstElement();
assertTrue("symbol".equals(symbolElem.getLocalName()));
- assertTrue("http://www.webserviceX.NET/".equals(symbolElem.getNamespace().getName()));
+ assertTrue("http://www.webserviceX.NET/".equals(symbolElem.getNamespace().getNamespaceURI()));
assertTrue("String".equals(symbolElem.getText()));
} else {
@@ -144,8 +142,8 @@
transformMediator.setXsltKey("xslt-key");
Map props = new HashMap();
- Property prop = new Property();
- prop.setType(Property.DYNAMIC_TYPE);
+ Entry prop = new Entry();
+ prop.setType(Entry.REMOTE_ENTRY);
prop.setKey("file:./../../repository/conf/sample/resources/transform/transform_unittest.xslt");
props.put("xslt-key", prop);
@@ -159,15 +157,15 @@
OMElement someOtherElem = (OMElement) body.getFirstOMChild().getNextOMSibling();
assertTrue("someOtherElement".equals(someOtherElem.getLocalName()));
- assertTrue("http://someother".equals(someOtherElem.getNamespace().getName()));
+ assertTrue("http://someother".equals(someOtherElem.getNamespace().getNamespaceURI()));
OMElement getQuoteElem = (OMElement) someOtherElem.getFirstOMChild();
assertTrue("GetQuote".equals(getQuoteElem.getLocalName()));
- assertTrue("http://www.webserviceX.NET/".equals(getQuoteElem.getNamespace().getName()));
+ assertTrue("http://www.webserviceX.NET/".equals(getQuoteElem.getNamespace().getNamespaceURI()));
OMElement symbolElem = getQuoteElem.getFirstElement();
assertTrue("symbol".equals(symbolElem.getLocalName()));
- assertTrue("http://www.webserviceX.NET/".equals(symbolElem.getNamespace().getName()));
+ assertTrue("http://www.webserviceX.NET/".equals(symbolElem.getNamespace().getNamespaceURI()));
assertTrue("String".equals(symbolElem.getText()));
} else {
Modified: webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/validate/ValidateMediatorTest.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/validate/ValidateMediatorTest.java?view=diff&rev=515014&r1=515013&r2=515014
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/validate/ValidateMediatorTest.java (original)
+++ webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/validate/ValidateMediatorTest.java Mon Mar 5 23:52:29 2007
@@ -26,7 +26,7 @@
import org.apache.synapse.mediators.TestUtils;
import org.apache.synapse.mediators.validate.ValidateMediator;
import org.apache.synapse.mediators.validate.ValidateMediatorFactory;
-import org.apache.synapse.config.Property;
+import org.apache.synapse.config.Entry;
import org.apache.synapse.TestMediator;
import org.apache.synapse.TestMediateHandler;
import org.apache.synapse.MessageContext;
@@ -156,8 +156,8 @@
validate.addChild(testMediator);
Map props = new HashMap();
- Property prop = new Property();
- prop.setType(Property.DYNAMIC_TYPE);
+ Entry prop = new Entry();
+ prop.setType(Entry.REMOTE_ENTRY);
prop.setKey("file:./../../repository/conf/sample/resources/validate/validate.xsd");
props.put("xsd-key", prop);
@@ -186,12 +186,12 @@
validate.addChild(testMediator);
Map props = new HashMap();
- Property prop = new Property();
- prop.setType(Property.DYNAMIC_TYPE);
+ Entry prop = new Entry();
+ prop.setType(Entry.REMOTE_ENTRY);
prop.setKey("file:./../../repository/conf/sample/resources/validate/validate.xsd");
props.put("xsd-key-1", prop);
- Property prop2 = new Property();
- prop2.setType(Property.DYNAMIC_TYPE);
+ Entry prop2 = new Entry();
+ prop2.setType(Entry.REMOTE_ENTRY);
prop2.setKey("file:./../../repository/conf/sample/resources/validate/validate2.xsd");
props.put("xsd-key-2", prop2);
@@ -220,12 +220,12 @@
validate.addChild(testMediator);
Map props = new HashMap();
- Property prop = new Property();
- prop.setType(Property.DYNAMIC_TYPE);
+ Entry prop = new Entry();
+ prop.setType(Entry.REMOTE_ENTRY);
prop.setKey("file:./../../repository/conf/sample/resources/validate/validate.xsd");
props.put("xsd-key-1", prop);
- Property prop2 = new Property();
- prop2.setType(Property.DYNAMIC_TYPE);
+ Entry prop2 = new Entry();
+ prop2.setType(Entry.REMOTE_ENTRY);
prop2.setKey("file:./../../repository/conf/sample/resources/validate/validate2.xsd");
props.put("xsd-key-2", prop2);
@@ -253,8 +253,8 @@
validate.addChild(testMediator);
Map props = new HashMap();
- Property prop = new Property();
- prop.setType(Property.DYNAMIC_TYPE);
+ Entry prop = new Entry();
+ prop.setType(Entry.REMOTE_ENTRY);
prop.setKey("file:./../../repository/conf/sample/resources/validate/validate.xsd");
props.put("xsd-key-1", prop);
@@ -282,8 +282,8 @@
validate.addChild(testMediator);
Map props = new HashMap();
- Property prop = new Property();
- prop.setType(Property.DYNAMIC_TYPE);
+ Entry prop = new Entry();
+ prop.setType(Entry.REMOTE_ENTRY);
prop.setKey("file:./../../repository/conf/sample/resources/validate/validate.xsd");
props.put("xsd-key-1", prop);
@@ -311,8 +311,8 @@
validate.addChild(testMediator);
Map props = new HashMap();
- Property prop = new Property();
- prop.setType(Property.DYNAMIC_TYPE);
+ Entry prop = new Entry();
+ prop.setType(Entry.REMOTE_ENTRY);
prop.setKey("file:./../../repository/conf/sample/resources/validate/validate.xsd");
props.put("xsd-key-1", prop);
@@ -365,8 +365,8 @@
validate.addChild(testMediator);
Map props = new HashMap();
- Property prop = new Property();
- prop.setType(Property.DYNAMIC_TYPE);
+ Entry prop = new Entry();
+ prop.setType(Entry.REMOTE_ENTRY);
prop.setKey("file:./../../repository/conf/sample/resources/validate/validate.xsd");
props.put("xsd-key-1", prop);
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org