Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/TestUtils.java URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/TestUtils.java?rev=405673&r1=405672&r2=405673&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 Wed May 10 01:20:20 2006 @@ -15,7 +15,7 @@ */ package org.apache.synapse.mediators; -import org.apache.synapse.TestSynapseMessageContext; +import org.apache.synapse.TestMessageContext; import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMDocument; @@ -27,10 +27,10 @@ public class TestUtils { - public static TestSynapseMessageContext getTestContext(String bodyText) throws Exception { + public static TestMessageContext getTestContext(String bodyText) throws Exception { // create a test synapse context - TestSynapseMessageContext synCtx = new TestSynapseMessageContext(); + TestMessageContext synCtx = new TestMessageContext(); SOAPEnvelope envelope = OMAbstractFactory.getSOAP11Factory().getDefaultEnvelope(); OMDocument omDoc = OMAbstractFactory.getSOAP11Factory().createOMDocument();
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/base/SequenceMediatorTest.java URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/base/SequenceMediatorTest.java?rev=405673&r1=405672&r2=405673&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 Wed May 10 01:20:20 2006 @@ -16,11 +16,10 @@ package org.apache.synapse.mediators.base; import junit.framework.TestCase; -import junit.framework.Test; import org.apache.synapse.mediators.TestMediator; import org.apache.synapse.mediators.TestMediateHandler; import org.apache.synapse.mediators.TestUtils; -import org.apache.synapse.SynapseMessageContext; +import org.apache.synapse.MessageContext; public class SequenceMediatorTest extends TestCase { @@ -31,21 +30,21 @@ TestMediator t1 = new TestMediator(); t1.setHandler( new TestMediateHandler() { - public void handle(SynapseMessageContext synCtx) { + public void handle(MessageContext synCtx) { result.append("T1."); } }); TestMediator t2 = new TestMediator(); t2.setHandler( new TestMediateHandler() { - public void handle(SynapseMessageContext synCtx) { + public void handle(MessageContext synCtx) { result.append("T2."); } }); TestMediator t3 = new TestMediator(); t3.setHandler( new TestMediateHandler() { - public void handle(SynapseMessageContext synCtx) { + public void handle(MessageContext synCtx) { result.append("T3"); } }); @@ -56,7 +55,7 @@ seq.addChild(t3); // invoke transformation, with static enveope - SynapseMessageContext synCtx = TestUtils.getTestContext("<empty/>"); + MessageContext synCtx = TestUtils.getTestContext("<empty/>"); seq.mediate(synCtx); assertTrue("T1.T2.T3".equals(result.toString())); Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/DropMediatorTest.java URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/DropMediatorTest.java?rev=405673&r1=405672&r2=405673&view=diff ============================================================================== --- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/DropMediatorTest.java (original) +++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/DropMediatorTest.java Wed May 10 01:20:20 2006 @@ -16,7 +16,7 @@ package org.apache.synapse.mediators.builtin; import junit.framework.TestCase; -import org.apache.synapse.SynapseMessageContext; +import org.apache.synapse.MessageContext; import org.apache.synapse.mediators.TestUtils; public class DropMediatorTest extends TestCase { @@ -26,7 +26,7 @@ DropMediator drop = new DropMediator(); // invoke transformation, with static enveope - SynapseMessageContext synCtx = TestUtils.getTestContext("<empty/>"); + MessageContext synCtx = TestUtils.getTestContext("<empty/>"); boolean returnValue = drop.mediate(synCtx); assertTrue(!returnValue); Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/PropertyMediatorTest.java URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/PropertyMediatorTest.java?rev=405673&r1=405672&r2=405673&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 Wed May 10 01:20:20 2006 @@ -16,7 +16,7 @@ package org.apache.synapse.mediators.builtin; import junit.framework.TestCase; -import org.apache.synapse.SynapseMessageContext; +import org.apache.synapse.MessageContext; import org.apache.synapse.Util; import org.apache.synapse.config.SynapseConfiguration; import org.apache.synapse.mediators.TestUtils; @@ -31,7 +31,7 @@ propMediator.setName("name"); propMediator.setValue("value"); - SynapseMessageContext synCtx = TestUtils.getTestContext("<empty/>"); + MessageContext synCtx = TestUtils.getTestContext("<empty/>"); propMediator.mediate(synCtx); assertTrue( @@ -45,7 +45,7 @@ */ public void testSetAndReadGlobalProperty() throws Exception { - SynapseMessageContext synCtx = TestUtils.getTestContext("<empty/>"); + MessageContext synCtx = TestUtils.getTestContext("<empty/>"); SynapseConfiguration synCfg = new SynapseConfiguration(); synCfg.addProperty("name", "value"); @@ -71,7 +71,7 @@ propMediator.setName("name"); propMediator.setValue("value"); - SynapseMessageContext synCtx = TestUtils.getTestContext("<empty/>"); + MessageContext synCtx = TestUtils.getTestContext("<empty/>"); propMediator.mediate(synCtx); // read property through a mediator property Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java?rev=405673&r1=405672&r2=405673&view=diff ============================================================================== --- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java (original) +++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/ValidateMediatorTest.java Wed May 10 01:20:20 2006 @@ -17,7 +17,7 @@ import junit.framework.TestCase; import org.apache.axiom.om.xpath.AXIOMXPath; -import org.apache.synapse.SynapseMessageContext; +import org.apache.synapse.MessageContext; import org.apache.synapse.mediators.TestMediateHandler; import org.apache.synapse.mediators.TestMediator; import org.apache.synapse.mediators.TestUtils; @@ -51,7 +51,7 @@ testMediator = new TestMediator(); testMediator.setHandler( new TestMediateHandler() { - public void handle(SynapseMessageContext synCtx) { + public void handle(MessageContext synCtx) { setOnFailInvoked(true); } }); Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/ext/ClassMediatorTest.java URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/ext/ClassMediatorTest.java?rev=405673&r1=405672&r2=405673&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 Wed May 10 01:20:20 2006 @@ -16,7 +16,7 @@ package org.apache.synapse.mediators.ext; import junit.framework.TestCase; -import org.apache.synapse.TestSynapseMessageContext; +import org.apache.synapse.TestMessageContext; import org.apache.synapse.mediators.MediatorProperty; import org.apache.axiom.om.xpath.AXIOMXPath; @@ -29,7 +29,7 @@ public void testCreationWithoutProperties() throws Exception { ClassMediator cm = new ClassMediator(); cm.setClazz(ClassMediatorTestMediator.class); - cm.mediate(new TestSynapseMessageContext()); + cm.mediate(new TestMessageContext()); assertTrue(ClassMediatorTestMediator.invoked); } @@ -40,7 +40,7 @@ mp.setValue("testValue"); cm.addProperty(mp); cm.setClazz(ClassMediatorTestMediator.class); - cm.mediate(new TestSynapseMessageContext()); + cm.mediate(new TestMessageContext()); assertTrue(ClassMediatorTestMediator.testProp.equals("testValue")); } @@ -51,7 +51,7 @@ mp.setExpression(new AXIOMXPath("concat('XPath ','is ','FUN!')")); cm.addProperty(mp); cm.setClazz(ClassMediatorTestMediator.class); - cm.mediate(new TestSynapseMessageContext()); + cm.mediate(new TestMessageContext()); assertTrue(ClassMediatorTestMediator.testProp.equals("XPath is FUN!")); } Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/ext/ClassMediatorTestMediator.java URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/ext/ClassMediatorTestMediator.java?rev=405673&r1=405672&r2=405673&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 Wed May 10 01:20:20 2006 @@ -16,7 +16,7 @@ package org.apache.synapse.mediators.ext; import org.apache.synapse.api.Mediator; -import org.apache.synapse.SynapseMessageContext; +import org.apache.synapse.MessageContext; /** * Since the class mediator always "instantiates" a new instance of a class @@ -29,7 +29,7 @@ public static String testProp = null; - public boolean mediate(SynapseMessageContext synCtx) { + public boolean mediate(MessageContext synCtx) { invoked = true; return false; } Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/filters/FilterMediatorTest.java URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/filters/FilterMediatorTest.java?rev=405673&r1=405672&r2=405673&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 Wed May 10 01:20:20 2006 @@ -19,7 +19,7 @@ import org.apache.synapse.mediators.TestMediateHandler; import org.apache.synapse.mediators.TestMediator; import org.apache.synapse.mediators.TestUtils; -import org.apache.synapse.SynapseMessageContext; +import org.apache.synapse.MessageContext; import org.apache.axiom.om.xpath.AXIOMXPath; import java.util.regex.Pattern; @@ -38,7 +38,7 @@ testMediator = new TestMediator(); testMediator.setHandler( new TestMediateHandler() { - public void handle(SynapseMessageContext synCtx) { + public void handle(MessageContext synCtx) { setFilterConditionPassed(true); } }); Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/filters/SwitchMediatorTest.java URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/filters/SwitchMediatorTest.java?rev=405673&r1=405672&r2=405673&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 Wed May 10 01:20:20 2006 @@ -19,7 +19,7 @@ import org.apache.synapse.mediators.TestMediateHandler; import org.apache.synapse.mediators.TestMediator; import org.apache.synapse.mediators.TestUtils; -import org.apache.synapse.SynapseMessageContext; +import org.apache.synapse.MessageContext; import org.apache.synapse.api.Mediator; import org.apache.axiom.om.xpath.AXIOMXPath; @@ -52,7 +52,7 @@ ibmMediator = new TestMediator(); ibmMediator.setHandler( new TestMediateHandler() { - public void handle(SynapseMessageContext synCtx) { + public void handle(MessageContext synCtx) { setExecutedCase("IBM"); } }); @@ -60,7 +60,7 @@ msftMediator = new TestMediator(); msftMediator.setHandler( new TestMediateHandler() { - public void handle(SynapseMessageContext synCtx) { + public void handle(MessageContext synCtx) { setExecutedCase("MSFT"); } }); @@ -68,7 +68,7 @@ defaultMediator = new TestMediator(); defaultMediator.setHandler( new TestMediateHandler() { - public void handle(SynapseMessageContext synCtx) { + public void handle(MessageContext synCtx) { setExecutedCase("DEFAULT"); } }); Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/transform/FaultMediatorTest.java URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/transform/FaultMediatorTest.java?rev=405673&r1=405672&r2=405673&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 Wed May 10 01:20:20 2006 @@ -20,7 +20,7 @@ import javax.xml.namespace.QName; import org.apache.synapse.mediators.TestUtils; -import org.apache.synapse.SynapseMessageContext; +import org.apache.synapse.MessageContext; import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axiom.soap.SOAPFault; @@ -30,29 +30,27 @@ private static final QName F_CODE = new QName("http://namespace";, "somefaultcode"); private static final String F_STRING = "Some fault string"; - private static final String F_ACTOR_URI = "http://factor";; + private static final String F_ACTOR_URI = "http://actor";; private static final String F_DETAIL = "Some detail text"; public void testSOAP11Fault() throws Exception { FaultMediator faultMediator = new FaultMediator(); faultMediator.setSoapVersion(FaultMediator.SOAP11); - faultMediator.setFaultcode(F_CODE); - faultMediator.setFaultstring(F_STRING); - faultMediator.setFaultactor(new URI(F_ACTOR_URI)); - faultMediator.setDetail(F_DETAIL); + faultMediator.setFaultCodeValue(F_CODE); + faultMediator.setFaultReasonValue(F_STRING); + faultMediator.setFaultRole(new URI(F_ACTOR_URI)); + faultMediator.setFaultDetail(F_DETAIL); // invoke transformation, with static enveope - SynapseMessageContext synCtx = TestUtils.getTestContext("<empty/>"); + MessageContext synCtx = TestUtils.getTestContext("<empty/>"); faultMediator.mediate(synCtx); SOAPEnvelope envelope = synCtx.getEnvelope(); SOAPFault fault = envelope.getBody().getFault(); assertTrue(F_CODE.equals(fault.getCode().getValue().getTextAsQName())); assertTrue(F_STRING.equals(fault.getReason().getFirstSOAPText().getText())); - assertTrue(F_ACTOR_URI.equals(fault.getNode().getNodeValue())); + assertTrue(F_ACTOR_URI.equals(fault.getRole().getRoleValue())); assertTrue(F_DETAIL.equals(fault.getDetail().getText())); - - System.out.println(envelope); } } Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/transform/HeaderMediatorTest.java URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/transform/HeaderMediatorTest.java?rev=405673&r1=405672&r2=405673&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 Wed May 10 01:20:20 2006 @@ -16,7 +16,7 @@ package org.apache.synapse.mediators.transform; import junit.framework.TestCase; -import org.apache.synapse.SynapseMessageContext; +import org.apache.synapse.MessageContext; import org.apache.synapse.HeaderType; import org.apache.synapse.mediators.TestUtils; import org.apache.axiom.om.xpath.AXIOMXPath; @@ -32,7 +32,7 @@ headerMediator.setValue(TEST_HEADER); // invoke transformation, with static enveope - SynapseMessageContext synCtx = TestUtils.getTestContext("<empty/>"); + MessageContext synCtx = TestUtils.getTestContext("<empty/>"); headerMediator.mediate(synCtx); assertTrue(TEST_HEADER.equals(synCtx.getTo().getAddress())); @@ -51,7 +51,7 @@ headerMediator.setExpression(new AXIOMXPath("concat('http://','server','/path')")); // invoke transformation, with static enveope - SynapseMessageContext synCtx = TestUtils.getTestContext("<empty/>"); + MessageContext synCtx = TestUtils.getTestContext("<empty/>"); headerMediator.mediate(synCtx); assertTrue(TEST_HEADER.equals(synCtx.getTo().getAddress())); Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/transform/TransformMediatorTest.java URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/transform/TransformMediatorTest.java?rev=405673&r1=405672&r2=405673&view=diff ============================================================================== --- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/transform/TransformMediatorTest.java (original) +++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/transform/TransformMediatorTest.java Wed May 10 01:20:20 2006 @@ -20,7 +20,7 @@ import org.apache.axiom.om.OMContainer; import org.apache.axiom.om.OMElement; import org.apache.synapse.mediators.TestUtils; -import org.apache.synapse.SynapseMessageContext; +import org.apache.synapse.MessageContext; import java.net.URL; import java.io.File; @@ -56,7 +56,7 @@ new URL("file:///" + new File(".").getAbsolutePath() + "/test-resources/misc/transform.xslt")); // invoke transformation, with static enveope - SynapseMessageContext synCtx = TestUtils.getTestContext(SOURCE); + MessageContext synCtx = TestUtils.getTestContext(SOURCE); transformMediator.mediate(synCtx); // validate result @@ -91,7 +91,7 @@ new URL("file:///" + new File(".").getAbsolutePath() + "/test-resources/misc/transform.xslt")); // invoke transformation, with static enveope - SynapseMessageContext synCtx = TestUtils.getTestContext(SOURCE); + MessageContext synCtx = TestUtils.getTestContext(SOURCE); transformMediator.mediate(synCtx); // validate result @@ -127,7 +127,7 @@ new URL("file:///" + new File(".").getAbsolutePath() + "/test-resources/misc/transform.xslt")); // invoke transformation, with static enveope - SynapseMessageContext synCtx = TestUtils.getTestContext(ENCLOSING_SOURCE); + MessageContext synCtx = TestUtils.getTestContext(ENCLOSING_SOURCE); transformMediator.mediate(synCtx); // validate result Modified: incubator/synapse/trunk/java/modules/samples/src/sampleMediators/InjectRedirect.java URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/samples/src/sampleMediators/InjectRedirect.java?rev=405673&r1=405672&r2=405673&view=diff ============================================================================== --- incubator/synapse/trunk/java/modules/samples/src/sampleMediators/InjectRedirect.java (original) +++ incubator/synapse/trunk/java/modules/samples/src/sampleMediators/InjectRedirect.java Wed May 10 01:20:20 2006 @@ -16,7 +16,7 @@ package sampleMediators; import org.apache.axis2.addressing.EndpointReference; -import org.apache.synapse.SynapseMessageContext; +import org.apache.synapse.MessageContext; import org.apache.synapse.mediators.AbstractMediator; public class InjectRedirect extends AbstractMediator { @@ -26,7 +26,7 @@ this.uri = uri; } - public boolean mediate(SynapseMessageContext mc) { + public boolean mediate(MessageContext mc) { System.out.println("Redirect.mediate: " + uri); Modified: incubator/synapse/trunk/java/modules/samples/src/sampleMediators/Logger.java URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/samples/src/sampleMediators/Logger.java?rev=405673&r1=405672&r2=405673&view=diff ============================================================================== --- incubator/synapse/trunk/java/modules/samples/src/sampleMediators/Logger.java (original) +++ incubator/synapse/trunk/java/modules/samples/src/sampleMediators/Logger.java Wed May 10 01:20:20 2006 @@ -15,7 +15,7 @@ */ package sampleMediators; -import org.apache.synapse.SynapseMessageContext; +import org.apache.synapse.MessageContext; import org.apache.synapse.mediators.AbstractMediator; import org.apache.axiom.soap.SOAPEnvelope; @@ -32,7 +32,7 @@ * * @see org.apache.synapse.mediator.Mediator#mediate(org.apache.axis2.context.MessageContext) */ - public boolean mediate(SynapseMessageContext mctx) { + public boolean mediate(MessageContext mctx) { System.out.println("Logger.mediate:"); if (mctx.getTo() != null && mctx.getTo().getAddress() != null) System.out.println("Logger.mediate to:" + mctx.getTo().getAddress()); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
