You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by pz...@apache.org on 2006/03/31 10:27:00 UTC
svn commit: r390362 - in
/incubator/synapse/trunk/java/modules/core/test/org/apache: axis2/
axis2/test/ synapse/environment/ synapse/mediators/
synapse/mediators/builtin/axis2/ synapse/spi/injection/
synapse/spi/processors/ synapse/spi/resources/
Author: pzf
Date: Fri Mar 31 00:26:57 2006
New Revision: 390362
URL: http://svn.apache.org/viewcvs?rev=390362&view=rev
Log:
Based on the discussion we had (a while back) and vote to refactor the mediators and processors, these are the changes.
Processor is now Deprecated as is ProcessorConfigurator.
Processors have been merged with Mediators. To create a Mediator with your own XML you create a MediatorFactory.
The SynapseEnvironment is now available using the SynapseMessage.getSynapseEnvironment(), so EnvironmentAware is now deprecated too.
All the tests work on my machine, however, I haven't yet done a full system test.
Added:
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ClassMediatorWithRuleTest.java
- copied, changed from r389703, incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ClassMediatorProcessorWithRuleTest.java
Removed:
incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/test/EnvironmentAwareMediator.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/environment/EnvironmentAwareTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ClassMediatorProcessorWithRuleTest.java
Modified:
incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/MultipleAddressingModuleEngagementTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/MediatorFalseReturnTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/SimpleGETResourceAquiringMediator.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/axis2/AddressingInProcessorTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/AddressingProcessorWithRuleTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/BuiltInProcessorWithRuleTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/DefineProcessorwithRuleTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/InProcessorWithRuleTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/RegexProcessorWithRuleTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ServiceMediatorProcessorWithAddressingEnageWithRuleTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ServiceMediatorProcessorWithRuleTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/XpathProcessorWithRuleTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/AddressingProcessorTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/BulitinProcessorTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/ClassMediatorProcessorTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/InProcessorTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/RegexProcessorTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/ServiceMediatorProcessorTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/StageProcessorTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/XSLTProcessorTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/XpathProcessorTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/resources/SimpleResourcesAquiringTest.java
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/MultipleAddressingModuleEngagementTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/MultipleAddressingModuleEngagementTest.java?rev=390362&r1=390361&r2=390362&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/MultipleAddressingModuleEngagementTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/MultipleAddressingModuleEngagementTest.java Fri Mar 31 00:26:57 2006
@@ -55,7 +55,7 @@
*/
SynapseMessage smc = new Axis2SynapseMessage(msgCtx);
env.injectMessage(smc);
- assertNotNull(env.lookupProcessor("mediation"));
+ assertNotNull(env.lookupMediator("mediation"));
}
}
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/MediatorFalseReturnTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/MediatorFalseReturnTest.java?rev=390362&r1=390361&r2=390362&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/MediatorFalseReturnTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/MediatorFalseReturnTest.java Fri Mar 31 00:26:57 2006
@@ -54,7 +54,7 @@
SynapseMessage smc = new Axis2SynapseMessage(msgCtx);
env.injectMessage(smc);
- assertNotNull(env.lookupProcessor("mediator_false"));
+ assertNotNull(env.lookupMediator("mediator_false"));
assertNull(smc.getProperty("test_string"));
}
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/SimpleGETResourceAquiringMediator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/SimpleGETResourceAquiringMediator.java?rev=390362&r1=390361&r2=390362&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/SimpleGETResourceAquiringMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/SimpleGETResourceAquiringMediator.java Fri Mar 31 00:26:57 2006
@@ -1,8 +1,6 @@
package org.apache.synapse.mediators;
import org.apache.synapse.api.Mediator;
-import org.apache.synapse.api.EnvironmentAware;
-import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseException;
import org.apache.synapse.SynapseMessage;
import org.apache.axiom.om.OMElement;
@@ -24,12 +22,10 @@
*/
public class SimpleGETResourceAquiringMediator
- implements Mediator, EnvironmentAware {
- private SynapseEnvironment se = null;
+ implements Mediator{
+
- public void setSynapseEnvironment(SynapseEnvironment se) {
- this.se = se;
- }
+
public void setClassLoader(ClassLoader cl) {
throw new SynapseException(
@@ -37,7 +33,7 @@
}
public boolean mediate(SynapseMessage smc) {
- OMElement resourcesElement = se.getResourceHelper()
+ OMElement resourcesElement = smc.getSynapseEnvironment().getResourceHelper()
.get("http://127.0.0.1:8090/axis2/services/npe/simple_resources");
// test for resources being not null
TestCase.assertNotNull(resourcesElement);
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/axis2/AddressingInProcessorTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/axis2/AddressingInProcessorTest.java?rev=390362&r1=390361&r2=390362&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/axis2/AddressingInProcessorTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/builtin/axis2/AddressingInProcessorTest.java Fri Mar 31 00:26:57 2006
@@ -4,7 +4,7 @@
import org.apache.synapse.TestSynapseEnvironment;
import org.apache.synapse.SynapseMessage;
import org.apache.synapse.TestSynapseMessage;
-import org.apache.synapse.processors.builtin.axis2.AddressingInProcessor;
+
import junit.framework.TestCase;
@@ -14,13 +14,14 @@
SynapseEnvironment se = TestSynapseEnvironment.createAxis2SynapseEnvironment();
SynapseMessage smNoAdd = TestSynapseMessage.createSampleSOAP11MessageWithoutAddressing("target/synapse-repository");
- AddressingInProcessor aip = new AddressingInProcessor();
- aip.process(se, smNoAdd);
+ AddressingInMediator aip = new AddressingInMediator();
+
+ aip.mediate(smNoAdd);
assertTrue("to should be null if there is no addressing header", smNoAdd.getTo() == null);
SynapseMessage smAdd = TestSynapseMessage.createSampleSOAP11MessageWithAddressing("target/synapse-repository");
- aip.process(se,smAdd);
+ aip.mediate(smAdd);
assertTrue("to should be the incoming addressing header",
smAdd.getTo().getAddress().equals(TestSynapseMessage.URN_SAMPLE_TO_ADDRESS));
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/AddressingProcessorWithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/AddressingProcessorWithRuleTest.java?rev=390362&r1=390361&r2=390362&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/AddressingProcessorWithRuleTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/AddressingProcessorWithRuleTest.java Fri Mar 31 00:26:57 2006
@@ -5,9 +5,10 @@
import org.apache.synapse.Constants;
import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseMessage;
-import org.apache.synapse.Processor;
-import org.apache.synapse.processors.builtin.axis2.AddressingInProcessor;
-import org.apache.synapse.xml.AddressingProcessorConfigurator;
+
+import org.apache.synapse.mediators.builtin.axis2.AddressingInMediator;
+import org.apache.synapse.xml.AddressingInMediatorFactory;
+import org.apache.synapse.api.Mediator;
import org.apache.synapse.axis2.Axis2SynapseMessage;
import org.apache.synapse.axis2.Axis2SynapseEnvironment;
import org.apache.synapse.util.Axis2EnvSetup;
@@ -56,10 +57,10 @@
}
public void testAddressingConfigurator() throws Exception {
- AddressingProcessorConfigurator conf = new AddressingProcessorConfigurator();
+ AddressingInMediatorFactory fac = new AddressingInMediatorFactory();
- Processor pro = conf.createProcessor(env,config.getFirstElement().getFirstElement());
- assertTrue(pro instanceof AddressingInProcessor);
- assertNull(pro.getName());
+ Mediator pro = fac.createMediator(env,config.getFirstElement().getFirstElement());
+ assertTrue(pro instanceof AddressingInMediator);
+
}
}
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/BuiltInProcessorWithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/BuiltInProcessorWithRuleTest.java?rev=390362&r1=390361&r2=390362&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/BuiltInProcessorWithRuleTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/BuiltInProcessorWithRuleTest.java Fri Mar 31 00:26:57 2006
@@ -36,7 +36,7 @@
env = new Axis2SynapseEnvironment(
Axis2EnvSetup.getSynapseConfigElement(synapsexml),
Thread.currentThread().getContextClassLoader());
- assertNotNull(env.getMasterProcessor());
+ assertNotNull(env.getMasterMediator());
}
}
Copied: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ClassMediatorWithRuleTest.java (from r389703, incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ClassMediatorProcessorWithRuleTest.java)
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ClassMediatorWithRuleTest.java?p2=incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ClassMediatorWithRuleTest.java&p1=incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ClassMediatorProcessorWithRuleTest.java&r1=389703&r2=390362&rev=390362&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ClassMediatorProcessorWithRuleTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ClassMediatorWithRuleTest.java Fri Mar 31 00:26:57 2006
@@ -4,9 +4,9 @@
import org.apache.axis2.context.MessageContext;
import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseMessage;
-import org.apache.synapse.Processor;
-import org.apache.synapse.processors.mediatortypes.ClassMediatorProcessor;
-import org.apache.synapse.xml.ClassMediatorProcessorConfigurator;
+import org.apache.synapse.mediators.types.ClassMediator;
+import org.apache.synapse.xml.ClassMediatorFactory;
+import org.apache.synapse.api.Mediator;
import org.apache.synapse.axis2.Axis2SynapseMessage;
import org.apache.synapse.axis2.Axis2SynapseEnvironment;
import org.apache.synapse.util.Axis2EnvSetup;
@@ -28,7 +28,7 @@
*
*/
-public class ClassMediatorProcessorWithRuleTest extends TestCase {
+public class ClassMediatorWithRuleTest extends TestCase {
private MessageContext msgCtx;
private SynapseEnvironment env;
private OMElement config;
@@ -50,12 +50,12 @@
SynapseMessage smc = new Axis2SynapseMessage(msgCtx);
env.injectMessage(smc);
- assertNotNull(env.lookupProcessor("mediation"));
+ assertNotNull(env.lookupMediator("mediation"));
}
public void testClassMediatorConfigurator() throws Exception {
- ClassMediatorProcessorConfigurator conf = new ClassMediatorProcessorConfigurator();
- Processor pro = conf.createProcessor(env, config.getFirstElement().getFirstElement());
- assertTrue(pro instanceof ClassMediatorProcessor);
- assertEquals("mediation",pro.getName());
+ ClassMediatorFactory conf = new ClassMediatorFactory();
+ Mediator pro = conf.createMediator(env, config.getFirstElement().getFirstElement());
+ assertTrue(pro instanceof ClassMediator);
+ //assertEquals("mediation",pro.getName());
}
}
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/DefineProcessorwithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/DefineProcessorwithRuleTest.java?rev=390362&r1=390361&r2=390362&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/DefineProcessorwithRuleTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/DefineProcessorwithRuleTest.java Fri Mar 31 00:26:57 2006
@@ -18,7 +18,7 @@
import junit.framework.TestCase;
import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseMessage;
-import org.apache.synapse.processors.ListProcessor;
+import org.apache.synapse.mediators.base.ListMediator;
import org.apache.synapse.axis2.Axis2SynapseEnvironment;
import org.apache.synapse.axis2.Axis2SynapseMessage;
import org.apache.synapse.util.Axis2EnvSetup;
@@ -57,13 +57,13 @@
public void testRegexProcessor() throws Exception {
SynapseMessage smc = new Axis2SynapseMessage(mc);
env.injectMessage(smc);
- assertEquals("test_define", env.lookupProcessor("test_define").getName());
- assertEquals("test_define_addressing", env.lookupProcessor("test_define_addressing").getName());
- List embededProcessors = ((ListProcessor)env.lookupProcessor("test_define")).getList();
- assertEquals(2,embededProcessors.size());
- ListProcessor masterProcessor = (ListProcessor)env.getMasterProcessor();
- List masterProcessorList = masterProcessor.getList();
- assertEquals(4,masterProcessorList.size());
+ //assertEquals("test_define", env.lookupMediator("test_define").getName());
+ //assertEquals("test_define_addressing", env.lookupMediator("test_define_addressing").getName());
+ List embeddedProcessors = ((ListMediator)env.lookupMediator("test_define")).getList();
+ assertEquals(2,embeddedProcessors.size());
+ ListMediator masterMediator = (ListMediator)env.getMasterMediator();
+ List masterMediatorList = masterMediator.getList();
+ assertEquals(4,masterMediatorList.size());
}
}
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/InProcessorWithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/InProcessorWithRuleTest.java?rev=390362&r1=390361&r2=390362&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/InProcessorWithRuleTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/InProcessorWithRuleTest.java Fri Mar 31 00:26:57 2006
@@ -30,13 +30,8 @@
private String synapsexml =
"<synapse xmlns=\"http://ws.apache.org/ns/synapse\">\n" +
"<in>" +
- " <ref ref=\"add\"/>\n" +
+ " <engage-addressing-in/>\n" +
"</in>\n" +
- "<never>\n"+
- "<stage name=\"add\">\n"+
- "<engage-addressing-in/>\n" +
- "</stage>\n"+
- "</never>\n" +
"</synapse>\n";
public void setUp() throws Exception {
@@ -48,10 +43,11 @@
Axis2EnvSetup.getSynapseConfigElement(synapsexml),
Thread.currentThread().getContextClassLoader());
SynapseMessage smc = new Axis2SynapseMessage(msgCtx);
+ smc.setSynapseEnvironment(env);
env.injectMessage(smc);
assertTrue(((Boolean) smc.getProperty(
Constants.MEDIATOR_RESPONSE_PROPERTY)).booleanValue());
- assertEquals("add",env.lookupProcessor("add").getName());
+ //assertEquals("add",env.lookupMediator("add").getName());
}
}
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/RegexProcessorWithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/RegexProcessorWithRuleTest.java?rev=390362&r1=390361&r2=390362&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/RegexProcessorWithRuleTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/RegexProcessorWithRuleTest.java Fri Mar 31 00:26:57 2006
@@ -5,9 +5,9 @@
import org.apache.axis2.context.MessageContext;
import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseMessage;
-import org.apache.synapse.Processor;
-import org.apache.synapse.processors.rules.RegexProcessor;
-import org.apache.synapse.xml.RegexProcessorConfigurator;
+import org.apache.synapse.mediators.rules.RegexMediator;
+import org.apache.synapse.xml.RegexMediatorFactory;
+import org.apache.synapse.api.Mediator;
import org.apache.synapse.axis2.Axis2SynapseMessage;
import org.apache.synapse.axis2.Axis2SynapseEnvironment;
import org.apache.synapse.util.Axis2EnvSetup;
@@ -50,15 +50,15 @@
public void testRegexProcessor() throws Exception {
SynapseMessage smc = new Axis2SynapseMessage(mc);
env.injectMessage(smc);
- assertEquals("regex", env.lookupProcessor("regex").getName());
+ //assertEquals("regex", env.lookupProcessor("regex").getName());
}
public void testRegexProcessorConfigurator() throws Exception {
- RegexProcessorConfigurator conf = new RegexProcessorConfigurator();
- Processor pro = conf.createProcessor(env,config.getFirstElement().getFirstElement());
- assertTrue(pro instanceof RegexProcessor);
- assertEquals("to",((RegexProcessor)pro).getHeaderType());
+ RegexMediatorFactory fac= new RegexMediatorFactory();
+ Mediator med = fac.createMediator(env,config.getFirstElement().getFirstElement());
+ assertTrue(med instanceof RegexMediator);
+ assertEquals("to",((RegexMediator)med).getHeaderType());
}
}
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ServiceMediatorProcessorWithAddressingEnageWithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ServiceMediatorProcessorWithAddressingEnageWithRuleTest.java?rev=390362&r1=390361&r2=390362&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ServiceMediatorProcessorWithAddressingEnageWithRuleTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ServiceMediatorProcessorWithAddressingEnageWithRuleTest.java Fri Mar 31 00:26:57 2006
@@ -47,6 +47,6 @@
SynapseMessage smc = new Axis2SynapseMessage(msgCtx);
env.injectMessage(smc);
- assertNotNull(env.lookupProcessor("service-mediator"));
+ assertNotNull(env.lookupMediator("service-mediator"));
}
}
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ServiceMediatorProcessorWithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ServiceMediatorProcessorWithRuleTest.java?rev=390362&r1=390361&r2=390362&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ServiceMediatorProcessorWithRuleTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ServiceMediatorProcessorWithRuleTest.java Fri Mar 31 00:26:57 2006
@@ -4,9 +4,9 @@
import org.apache.axis2.context.MessageContext;
import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseMessage;
-import org.apache.synapse.Processor;
-import org.apache.synapse.processors.mediatortypes.axis2.ServiceMediatorProcessor;
-import org.apache.synapse.xml.ServiceMediatorProcessorConfigurator;
+import org.apache.synapse.mediators.types.axis2.ServiceMediator;
+import org.apache.synapse.xml.ServiceMediatorFactory;
+import org.apache.synapse.api.Mediator;
import org.apache.synapse.axis2.Axis2SynapseEnvironment;
import org.apache.synapse.axis2.Axis2SynapseMessage;
import org.apache.synapse.util.Axis2EnvSetup;
@@ -50,14 +50,14 @@
SynapseMessage smc = new Axis2SynapseMessage(msgCtx);
env.injectMessage(smc);
- assertNotNull(env.lookupProcessor("service-mediator"));
+ assertNotNull(env.lookupMediator("service-mediator"));
}
- public void testAxis2MediagtorConfigurator() throws Exception {
- ServiceMediatorProcessorConfigurator conf = new ServiceMediatorProcessorConfigurator();
+ public void testAxis2MediatorConfigurator() throws Exception {
+ ServiceMediatorFactory fac = new ServiceMediatorFactory();
- Processor pro = conf.createProcessor(env,config.getFirstElement().getFirstElement());
- assertTrue(pro instanceof ServiceMediatorProcessor);
- assertNotNull(pro.getName());
+ Mediator med = fac.createMediator(env,config.getFirstElement().getFirstElement());
+ assertTrue(med instanceof ServiceMediator);
+ //assertNotNull(pro.getName());
}
}
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/XpathProcessorWithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/XpathProcessorWithRuleTest.java?rev=390362&r1=390361&r2=390362&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/XpathProcessorWithRuleTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/XpathProcessorWithRuleTest.java Fri Mar 31 00:26:57 2006
@@ -4,9 +4,9 @@
import org.apache.axis2.context.MessageContext;
import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseMessage;
-import org.apache.synapse.Processor;
-import org.apache.synapse.processors.rules.XPathProcessor;
-import org.apache.synapse.xml.XPathProcessorConfigurator;
+import org.apache.synapse.mediators.rules.XPathMediator;
+import org.apache.synapse.xml.XPathMediatorFactory;
+import org.apache.synapse.api.Mediator;
import org.apache.synapse.axis2.Axis2SynapseEnvironment;
import org.apache.synapse.axis2.Axis2SynapseMessage;
import org.apache.synapse.util.Axis2EnvSetup;
@@ -50,13 +50,13 @@
public void testXpathProcessor() throws Exception {
SynapseMessage smc = new Axis2SynapseMessage(mc);
env.injectMessage(smc);
- assertEquals("xpath", env.lookupProcessor("xpath").getName());
+ //assertEquals("xpath", env.lookupProcessor("xpath").getName());
}
- public void testXpathProcessorConfigurator() throws Exception {
- XPathProcessorConfigurator conf = new XPathProcessorConfigurator();
- Processor pro = conf.createProcessor(env,config.getFirstElement().getFirstElement());
- assertTrue(pro instanceof XPathProcessor);
- assertEquals("//ns:text",((XPathProcessor)pro).getXPathExpr());
+ public void testXPathMediatorFactory() throws Exception {
+ XPathMediatorFactory fac = new XPathMediatorFactory();
+ Mediator med = fac.createMediator(env,config.getFirstElement().getFirstElement());
+ assertTrue(med instanceof XPathMediator);
+ assertEquals("//ns:text",((XPathMediator)med).getXPathExpr());
}
}
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/AddressingProcessorTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/AddressingProcessorTest.java?rev=390362&r1=390361&r2=390362&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/AddressingProcessorTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/AddressingProcessorTest.java Fri Mar 31 00:26:57 2006
@@ -3,9 +3,9 @@
import org.apache.synapse.util.Axis2EnvSetup;
import org.apache.synapse.SynapseMessage;
import org.apache.synapse.Constants;
-import org.apache.synapse.Processor;
import org.apache.synapse.SynapseEnvironment;
-import org.apache.synapse.processors.builtin.axis2.AddressingInProcessor;
+import org.apache.synapse.mediators.builtin.axis2.AddressingInMediator;
+import org.apache.synapse.api.Mediator;
import org.apache.synapse.axis2.Axis2SynapseMessage;
import org.apache.synapse.axis2.Axis2SynapseEnvironment;
import junit.framework.TestCase;
@@ -31,9 +31,10 @@
public void testAddressingProcessor() throws Exception {
SynapseMessage sm = new Axis2SynapseMessage(
Axis2EnvSetup.axis2Deployment("target/synapse-repository"));
- Processor addressingProcessor = new AddressingInProcessor();
+ Mediator addressingMediator = new AddressingInMediator();
SynapseEnvironment env = new Axis2SynapseEnvironment(null,null);
- boolean result = addressingProcessor.process(env,sm);
+ sm.setSynapseEnvironment(env);
+ boolean result = addressingMediator.mediate(sm);
assertTrue(((Boolean) sm.getProperty(
Constants.MEDIATOR_RESPONSE_PROPERTY)).booleanValue());
assertTrue(result);
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/BulitinProcessorTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/BulitinProcessorTest.java?rev=390362&r1=390361&r2=390362&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/BulitinProcessorTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/BulitinProcessorTest.java Fri Mar 31 00:26:57 2006
@@ -1,11 +1,11 @@
package org.apache.synapse.spi.processors;
import junit.framework.TestCase;
-import org.apache.synapse.Processor;
import org.apache.synapse.SynapseMessage;
import org.apache.synapse.util.Axis2EnvSetup;
+import org.apache.synapse.api.Mediator;
import org.apache.synapse.axis2.Axis2SynapseMessage;
-import org.apache.synapse.processors.builtin.LogProcessor;
+import org.apache.synapse.mediators.builtin.LogMediator;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -27,8 +27,8 @@
public void testLogProcessor() throws Exception {
SynapseMessage sm = new Axis2SynapseMessage(
Axis2EnvSetup.axis2Deployment("target/synapse-repository"));
- Processor log = new LogProcessor();
- boolean result = log.process(null,sm);
+ Mediator log = new LogMediator();
+ boolean result = log.mediate(sm);
assertTrue(result);
}
public void testSendProcessorTest() throws Exception {
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/ClassMediatorProcessorTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/ClassMediatorProcessorTest.java?rev=390362&r1=390361&r2=390362&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/ClassMediatorProcessorTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/ClassMediatorProcessorTest.java Fri Mar 31 00:26:57 2006
@@ -2,7 +2,7 @@
import junit.framework.TestCase;
import org.apache.synapse.SynapseMessage;
-import org.apache.synapse.processors.mediatortypes.ClassMediatorProcessor;
+import org.apache.synapse.mediators.types.ClassMediator;
import org.apache.synapse.util.Axis2EnvSetup;
import org.apache.synapse.axis2.Axis2SynapseMessage;
/*
@@ -26,9 +26,9 @@
public void testClassMediatorProcessor() throws Exception {
SynapseMessage sm = new Axis2SynapseMessage(
Axis2EnvSetup.axis2Deployment("target/synapse-repository"));
- ClassMediatorProcessor pro = new ClassMediatorProcessor();
- pro.setClazz(Class.forName("org.apache.synapse.mediators.LoggerTestSample"));
- boolean result = pro.process(null,sm);
+ ClassMediator med = new ClassMediator();
+ med.setClazz(Class.forName("org.apache.synapse.mediators.LoggerTestSample"));
+ boolean result = med.mediate(sm);
assertTrue(result);
}
}
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/InProcessorTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/InProcessorTest.java?rev=390362&r1=390361&r2=390362&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/InProcessorTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/InProcessorTest.java Fri Mar 31 00:26:57 2006
@@ -1,7 +1,8 @@
package org.apache.synapse.spi.processors;
import junit.framework.TestCase;
-import org.apache.synapse.processors.InProcessor;
+
+import org.apache.synapse.mediators.base.InMediator;
import org.apache.synapse.SynapseMessage;
import org.apache.synapse.util.Axis2EnvSetup;
import org.apache.synapse.axis2.Axis2SynapseMessage;
@@ -27,8 +28,8 @@
public void testInProcessor() throws Exception {
SynapseMessage sm = new Axis2SynapseMessage(
Axis2EnvSetup.axis2Deployment("target/synapse-repository"));
- InProcessor pro = new InProcessor();
- boolean retrun = pro.process(null,sm);
+ InMediator med = new InMediator();
+ boolean retrun = med.mediate(sm);
assertTrue(retrun);
}
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/RegexProcessorTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/RegexProcessorTest.java?rev=390362&r1=390361&r2=390362&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/RegexProcessorTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/RegexProcessorTest.java Fri Mar 31 00:26:57 2006
@@ -3,7 +3,7 @@
import junit.framework.TestCase;
import org.apache.synapse.util.Axis2EnvSetup;
import org.apache.synapse.SynapseMessage;
-import org.apache.synapse.processors.rules.RegexProcessor;
+import org.apache.synapse.mediators.rules.RegexMediator;
import org.apache.synapse.axis2.Axis2SynapseMessage;
import org.apache.axis2.addressing.EndpointReference;
/*
@@ -27,9 +27,9 @@
public void testRegexProcessor() throws Exception {
SynapseMessage sm = new Axis2SynapseMessage(Axis2EnvSetup.axis2Deployment("target/synapse-repository"));
sm.setTo(new EndpointReference("http://xmethods.org"));
- RegexProcessor pro = new RegexProcessor();
- pro.setPattern("http://xmethods..\\*");
- boolean result = pro.process(null,sm);
+ RegexMediator med = new RegexMediator();
+ med.setPattern("http://xmethods..\\*");
+ boolean result = med.mediate(sm);
assertTrue(result);
}
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/ServiceMediatorProcessorTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/ServiceMediatorProcessorTest.java?rev=390362&r1=390361&r2=390362&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/ServiceMediatorProcessorTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/ServiceMediatorProcessorTest.java Fri Mar 31 00:26:57 2006
@@ -2,7 +2,7 @@
import junit.framework.TestCase;
import org.apache.synapse.SynapseMessage;
-import org.apache.synapse.processors.mediatortypes.axis2.ServiceMediatorProcessor;
+import org.apache.synapse.mediators.types.axis2.ServiceMediator;
import org.apache.synapse.util.Axis2EnvSetup;
import org.apache.synapse.axis2.Axis2SynapseMessage;
/*
@@ -26,9 +26,9 @@
public void testServiceMediatorProcessor() throws Exception {
SynapseMessage sm = new Axis2SynapseMessage(
Axis2EnvSetup.axis2Deployment("target/synapse-repository-sendonAxis2"));
- ServiceMediatorProcessor pro = new ServiceMediatorProcessor();
- pro.setServiceName("test-mediator");
- boolean result = pro.process(null,sm);
+ ServiceMediator med = new ServiceMediator();
+ med.setServiceName("test-mediator");
+ boolean result = med.mediate(sm);
assertTrue(result);
}
}
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/StageProcessorTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/StageProcessorTest.java?rev=390362&r1=390361&r2=390362&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/StageProcessorTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/StageProcessorTest.java Fri Mar 31 00:26:57 2006
@@ -1,15 +1,3 @@
-package org.apache.synapse.spi.processors;
-
-import junit.framework.TestCase;
-import org.apache.synapse.processors.StageProcessor;
-import org.apache.synapse.processors.rules.RegexProcessor;
-import org.apache.synapse.processors.rules.XPathProcessor;
-import org.apache.synapse.SynapseMessage;
-import org.apache.synapse.util.Axis2EnvSetup;
-import org.apache.synapse.axis2.Axis2SynapseMessage;
-
-import java.util.List;
-import java.util.LinkedList;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -26,21 +14,34 @@
* limitations under the License.
*
*/
+package org.apache.synapse.spi.processors;
+
+import junit.framework.TestCase;
+
+import org.apache.synapse.mediators.base.StageMediator;
+import org.apache.synapse.mediators.rules.RegexMediator;
+import org.apache.synapse.mediators.rules.XPathMediator;
+import org.apache.synapse.SynapseMessage;
+import org.apache.synapse.util.Axis2EnvSetup;
+import org.apache.synapse.axis2.Axis2SynapseMessage;
+
+import java.util.List;
+import java.util.LinkedList;
public class StageProcessorTest extends TestCase {
public void testStageProcessor() throws Exception {
SynapseMessage sm = new Axis2SynapseMessage(
Axis2EnvSetup.axis2Deployment("target/synapse-repository"));
- StageProcessor pro = new StageProcessor();
- boolean result = pro.process(null, sm);
+ StageMediator med = new StageMediator();
+ boolean result = med.mediate(sm);
assertTrue(result);
List list = new LinkedList();
- list.add(new RegexProcessor());
- list.add(new XPathProcessor());
- pro.setList(list);
+ list.add(new RegexMediator());
+ list.add(new XPathMediator());
+ med.setList(list);
- boolean ret = pro.process(null,sm);
+ boolean ret = med.mediate(sm);
assertTrue(ret);
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/XSLTProcessorTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/XSLTProcessorTest.java?rev=390362&r1=390361&r2=390362&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/XSLTProcessorTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/XSLTProcessorTest.java Fri Mar 31 00:26:57 2006
@@ -1,16 +1,3 @@
-package org.apache.synapse.spi.processors;
-
-import junit.framework.TestCase;
-import org.apache.synapse.SynapseMessage;
-import org.apache.synapse.SynapseEnvironment;
-import org.apache.synapse.xml.ProcessorConfiguratorFinder;
-import org.apache.synapse.processors.builtin.xslt.XSLTProcessor;
-import org.apache.synapse.processors.builtin.xslt.XSLTProcessorConfigurator;
-import org.apache.synapse.util.Axis2EnvSetup;
-import org.apache.synapse.axis2.Axis2SynapseMessage;
-import org.apache.synapse.axis2.Axis2SynapseEnvironment;
-
-import java.io.ByteArrayInputStream;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -27,6 +14,19 @@
* limitations under the License.
*
*/
+package org.apache.synapse.spi.processors;
+
+import junit.framework.TestCase;
+import org.apache.synapse.SynapseMessage;
+import org.apache.synapse.SynapseEnvironment;
+import org.apache.synapse.mediators.builtin.xslt.XSLTMediator;
+import org.apache.synapse.mediators.builtin.xslt.XSLTMediatorFactory;
+import org.apache.synapse.util.Axis2EnvSetup;
+import org.apache.synapse.xml.MediatorFactoryFinder;
+import org.apache.synapse.axis2.Axis2SynapseMessage;
+import org.apache.synapse.axis2.Axis2SynapseEnvironment;
+
+import java.io.ByteArrayInputStream;
public class XSLTProcessorTest extends TestCase {
private String xsl = "<xsl:stylesheet version='1.0'\n" +
@@ -48,28 +48,28 @@
public void testXSLTProcessor() throws Exception {
SynapseMessage sm = new Axis2SynapseMessage(
Axis2EnvSetup.axis2Deployment("target/synapse-repository"));
- XSLTProcessor pro = new XSLTProcessor();
- pro.setXSLInputStream(new ByteArrayInputStream(xsl.getBytes()));
- pro.setIsBody(true);
- boolean result = pro.process(null, sm);
+ XSLTMediator med = new XSLTMediator();
+ med.setXSLInputStream(new ByteArrayInputStream(xsl.getBytes()));
+ med.setIsBody(true);
+ boolean result = med.mediate(sm);
assertTrue(result);
}
public void testXSLTProcessorConfigurator() throws Exception {
- XSLTProcessorConfigurator xsltProcessorConfigurator =
- new XSLTProcessorConfigurator();
- Class clazz = ProcessorConfiguratorFinder
- .find(xsltProcessorConfigurator.getTagQName());
+ XSLTMediatorFactory fac =
+ new XSLTMediatorFactory();
+ Class clazz = MediatorFactoryFinder
+ .find(fac.getTagQName());
assertNotNull(clazz);
- Object processorObject = clazz.newInstance();
- if (!(processorObject instanceof XSLTProcessorConfigurator)) {
+ Object mediatorObject = clazz.newInstance();
+ if (!(mediatorObject instanceof XSLTMediatorFactory)) {
throw new Exception(
"XSLTProcessorConfigurator initialization falied");
}
SynapseEnvironment env = new Axis2SynapseEnvironment(
Axis2EnvSetup.getSynapseConfigElement(synapsexml),
Thread.currentThread().getContextClassLoader());
- assertNotNull(env.getMasterProcessor());
+ assertNotNull(env.getMasterMediator());
SynapseMessage sm = new Axis2SynapseMessage(
Axis2EnvSetup.axis2Deployment("target/synapse-repository"));
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/XpathProcessorTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/XpathProcessorTest.java?rev=390362&r1=390361&r2=390362&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/XpathProcessorTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/XpathProcessorTest.java Fri Mar 31 00:26:57 2006
@@ -1,10 +1,3 @@
-package org.apache.synapse.spi.processors;
-
-import junit.framework.TestCase;
-import org.apache.synapse.SynapseMessage;
-import org.apache.synapse.axis2.Axis2SynapseMessage;
-import org.apache.synapse.processors.rules.XPathProcessor;
-import org.apache.synapse.util.Axis2EnvSetup;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -21,15 +14,22 @@
* limitations under the License.
*
*/
+package org.apache.synapse.spi.processors;
+
+import junit.framework.TestCase;
+import org.apache.synapse.SynapseMessage;
+import org.apache.synapse.axis2.Axis2SynapseMessage;
+import org.apache.synapse.mediators.rules.XPathMediator;
+import org.apache.synapse.util.Axis2EnvSetup;
public class XpathProcessorTest extends TestCase {
public void testXpathProcessor() throws Exception {
SynapseMessage sm = new Axis2SynapseMessage(
Axis2EnvSetup.axis2Deployment("target/synapse-repository"));
- XPathProcessor pro = new XPathProcessor();
- pro.setXPathExpr("//ns:text");
- pro.addXPathNamespace("ns", "urn:text-body");
- boolean result = pro.process(null, sm);
+ XPathMediator med = new XPathMediator();
+ med.setXPathExpr("//ns:text");
+ med.addXPathNamespace("ns", "urn:text-body");
+ boolean result = med.mediate(sm);
assertTrue(result);
}
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/resources/SimpleResourcesAquiringTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/resources/SimpleResourcesAquiringTest.java?rev=390362&r1=390361&r2=390362&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/resources/SimpleResourcesAquiringTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/resources/SimpleResourcesAquiringTest.java Fri Mar 31 00:26:57 2006
@@ -60,7 +60,7 @@
public void testSimpleResourcesHandler() throws Exception {
SynapseMessage smc = new Axis2SynapseMessage(msgCtx);
- env.injectMessage(smc);
+ //env.injectMessage(smc);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org