Author: pzf
Date: Fri Mar 31 06:27:20 2006
New Revision: 390430
URL: http://svn.apache.org/viewcvs?rev=390430&view=rev
Log:
Fix to ensure a SynapseEnv is passed when constructing a new SynapseMessage
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2Sender.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseEnvironment.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseMessage.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/ServiceMediatorMessageReceiver.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/SynapseMessageReceiver.java
incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/ExceptionHandlingTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/MultipleAddressingModuleEngagementTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/TestSynapseMessage.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/MediatorFalseReturnTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/conditions/ExactlyOneProcessorWithRuleTest.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/ClassMediatorWithRuleTest.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
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spi/injection/SpringMediatorProcessorWithRuleTest.java
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2Sender.java
URL:
http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2Sender.java?rev=390430&r1=390429&r2=390430&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2Sender.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2Sender.java
Fri Mar 31 06:27:20 2006
@@ -138,7 +138,7 @@
if (smc.getSynapseEnvironment()==null) {
throw new SynapseException("no Synapse Env set on message");
}
- smc.getSynapseEnvironment().injectMessage(new
Axis2SynapseMessage(outMsgContext));
+ smc.getSynapseEnvironment().injectMessage(new
Axis2SynapseMessage(outMsgContext, smc.getSynapseEnvironment()));
} catch (Exception e) {
e.printStackTrace();
throw new SynapseException(e);
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseEnvironment.java
URL:
http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseEnvironment.java?rev=390430&r1=390429&r2=390430&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseEnvironment.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseEnvironment.java
Fri Mar 31 06:27:20 2006
@@ -41,6 +41,8 @@
*
*/
public class Axis2SynapseEnvironment extends SynapseEnvironment {
+
+
private Mediator mainmediator = null;
private ClassLoader cl = null;
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseMessage.java
URL:
http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseMessage.java?rev=390430&r1=390429&r2=390430&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseMessage.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseMessage.java
Fri Mar 31 06:27:20 2006
@@ -45,9 +45,9 @@
private boolean faultResponse = false;
- public Axis2SynapseMessage(MessageContext mc) {
+ public Axis2SynapseMessage(MessageContext mc, SynapseEnvironment se) {
setMessageContext(mc);
-
setSynapseEnvironment(Axis2SynapseEnvironmentFinder.getSynapseEnvironment(mc));
+ setSynapseEnvironment(se);
}
public EndpointReference getFaultTo() {
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/ServiceMediatorMessageReceiver.java
URL:
http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/ServiceMediatorMessageReceiver.java?rev=390430&r1=390429&r2=390430&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/ServiceMediatorMessageReceiver.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/ServiceMediatorMessageReceiver.java
Fri Mar 31 06:27:20 2006
@@ -22,7 +22,7 @@
}
*/
- SynapseMessage smc = new Axis2SynapseMessage(messageContext);
+ SynapseMessage smc = new Axis2SynapseMessage(messageContext,
Axis2SynapseEnvironmentFinder.getSynapseEnvironment(messageContext));
boolean returnValue = mediator.mediate(smc);
messageContext.setProperty(Constants.MEDIATOR_RESPONSE_PROPERTY,
new Boolean(returnValue));
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/SynapseMessageReceiver.java
URL:
http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/SynapseMessageReceiver.java?rev=390430&r1=390429&r2=390430&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/SynapseMessageReceiver.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/SynapseMessageReceiver.java
Fri Mar 31 06:27:20 2006
@@ -45,7 +45,7 @@
// So it a mediator uses EnvironmentAware, that mediator will be
injected with the correct environment
////////////////////////////////////////////////////////////////////////
- SynapseMessage smc = new Axis2SynapseMessage(mc);
+ SynapseMessage smc = new Axis2SynapseMessage(mc,env);
smc.setSynapseEnvironment(env);
env.injectMessage(smc);
Modified:
incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/ExceptionHandlingTest.java
URL:
http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/ExceptionHandlingTest.java?rev=390430&r1=390429&r2=390430&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/ExceptionHandlingTest.java
(original)
+++
incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/ExceptionHandlingTest.java
Fri Mar 31 06:27:20 2006
@@ -57,7 +57,7 @@
public void testFaultScenario() {
try {
- env.injectMessage(new Axis2SynapseMessage(msgCtx));
+ env.injectMessage(new Axis2SynapseMessage(msgCtx, env));
fail("Native End Point Throws an Exception");
} catch (Exception e) {
}
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=390430&r1=390429&r2=390430&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 06:27:20 2006
@@ -53,7 +53,7 @@
/**
* Test case return an excetion if Something goes wrong in
AddressingINProcessor
*/
- SynapseMessage smc = new Axis2SynapseMessage(msgCtx);
+ SynapseMessage smc = new Axis2SynapseMessage(msgCtx,env);
env.injectMessage(smc);
assertNotNull(env.lookupMediator("mediation"));
}
Modified:
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/TestSynapseMessage.java
URL:
http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/TestSynapseMessage.java?rev=390430&r1=390429&r2=390430&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/TestSynapseMessage.java
(original)
+++
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/TestSynapseMessage.java
Fri Mar 31 06:27:20 2006
@@ -6,7 +6,9 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.ConfigurationContextFactory;
+import org.apache.synapse.axis2.Axis2SynapseEnvironment;
import org.apache.synapse.axis2.Axis2SynapseMessage;
+import org.apache.synapse.util.Axis2EnvSetup;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
@@ -44,8 +46,8 @@
} catch (AxisFault e) {
throw new SynapseException(e);
}
-
- return new Axis2SynapseMessage(msgCtx);
+
+ return new Axis2SynapseMessage(msgCtx,null);
}
public static Axis2SynapseMessage createSampleSOAP11MessageWithAddressing(
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=390430&r1=390429&r2=390430&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 06:27:20 2006
@@ -52,7 +52,7 @@
public void testFalseReturnFromMediator() throws Exception {
- SynapseMessage smc = new Axis2SynapseMessage(msgCtx);
+ SynapseMessage smc = new Axis2SynapseMessage(msgCtx,env);
env.injectMessage(smc);
assertNotNull(env.lookupMediator("mediator_false"));
assertNull(smc.getProperty("test_string"));
Modified:
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/conditions/ExactlyOneProcessorWithRuleTest.java
URL:
http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/conditions/ExactlyOneProcessorWithRuleTest.java?rev=390430&r1=390429&r2=390430&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/conditions/ExactlyOneProcessorWithRuleTest.java
(original)
+++
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/conditions/ExactlyOneProcessorWithRuleTest.java
Fri Mar 31 06:27:20 2006
@@ -48,7 +48,7 @@
config = Axis2EnvSetup.getSynapseConfigElement(synapsexml1);
env = new Axis2SynapseEnvironment(config,
Thread.currentThread().getContextClassLoader());
- SynapseMessage smc = new Axis2SynapseMessage(mc);
+ SynapseMessage smc = new Axis2SynapseMessage(mc,env);
env.injectMessage(smc);
assertTrue(((Boolean) smc.getProperty(
Constants.MEDIATOR_RESPONSE_PROPERTY)).booleanValue());
@@ -60,7 +60,7 @@
config = Axis2EnvSetup.getSynapseConfigElement(synapsexml2);
env = new Axis2SynapseEnvironment(config,
Thread.currentThread().getContextClassLoader());
- SynapseMessage smc = new Axis2SynapseMessage(mc);
+ SynapseMessage smc = new Axis2SynapseMessage(mc,env);
env.injectMessage(smc);
assertTrue(((Boolean) smc.getProperty(
Constants.MEDIATOR_RESPONSE_PROPERTY)).booleanValue());
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=390430&r1=390429&r2=390430&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 06:27:20 2006
@@ -50,7 +50,7 @@
public void testAddressingProcessor() throws Exception {
- SynapseMessage smc = new Axis2SynapseMessage(msgCtx);
+ SynapseMessage smc = new Axis2SynapseMessage(msgCtx,env);
env.injectMessage(smc);
assertTrue(((Boolean) smc.getProperty(
Constants.MEDIATOR_RESPONSE_PROPERTY)).booleanValue());
Modified:
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ClassMediatorWithRuleTest.java
URL:
http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ClassMediatorWithRuleTest.java?rev=390430&r1=390429&r2=390430&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ClassMediatorWithRuleTest.java
(original)
+++
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ClassMediatorWithRuleTest.java
Fri Mar 31 06:27:20 2006
@@ -48,7 +48,7 @@
public void testClassMediatorProcessor() throws Exception {
- SynapseMessage smc = new Axis2SynapseMessage(msgCtx);
+ SynapseMessage smc = new Axis2SynapseMessage(msgCtx,env);
env.injectMessage(smc);
assertNotNull(env.lookupMediator("mediation"));
}
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=390430&r1=390429&r2=390430&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 06:27:20 2006
@@ -55,7 +55,7 @@
}
public void testRegexProcessor() throws Exception {
- SynapseMessage smc = new Axis2SynapseMessage(mc);
+ SynapseMessage smc = new Axis2SynapseMessage(mc,env);
env.injectMessage(smc);
//assertEquals("test_define",
env.lookupMediator("test_define").getName());
//assertEquals("test_define_addressing",
env.lookupMediator("test_define_addressing").getName());
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=390430&r1=390429&r2=390430&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 06:27:20 2006
@@ -42,7 +42,7 @@
SynapseEnvironment env = new Axis2SynapseEnvironment(
Axis2EnvSetup.getSynapseConfigElement(synapsexml),
Thread.currentThread().getContextClassLoader());
- SynapseMessage smc = new Axis2SynapseMessage(msgCtx);
+ SynapseMessage smc = new Axis2SynapseMessage(msgCtx,env);
smc.setSynapseEnvironment(env);
env.injectMessage(smc);
assertTrue(((Boolean) smc.getProperty(
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=390430&r1=390429&r2=390430&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 06:27:20 2006
@@ -48,7 +48,7 @@
}
public void testRegexProcessor() throws Exception {
- SynapseMessage smc = new Axis2SynapseMessage(mc);
+ SynapseMessage smc = new Axis2SynapseMessage(mc,env);
env.injectMessage(smc);
//assertEquals("regex", env.lookupProcessor("regex").getName());
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=390430&r1=390429&r2=390430&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 06:27:20 2006
@@ -45,7 +45,7 @@
public void testServiceMediatorWithAddressingEngage() throws Exception {
- SynapseMessage smc = new Axis2SynapseMessage(msgCtx);
+ SynapseMessage smc = new Axis2SynapseMessage(msgCtx,env);
env.injectMessage(smc);
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=390430&r1=390429&r2=390430&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 06:27:20 2006
@@ -48,7 +48,7 @@
public void testAxis2MediatorProcessor() throws Exception {
- SynapseMessage smc = new Axis2SynapseMessage(msgCtx);
+ SynapseMessage smc = new Axis2SynapseMessage(msgCtx,env);
env.injectMessage(smc);
assertNotNull(env.lookupMediator("service-mediator"));
}
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=390430&r1=390429&r2=390430&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 06:27:20 2006
@@ -48,7 +48,7 @@
}
public void testXpathProcessor() throws Exception {
- SynapseMessage smc = new Axis2SynapseMessage(mc);
+ SynapseMessage smc = new Axis2SynapseMessage(mc,env);
env.injectMessage(smc);
//assertEquals("xpath", env.lookupProcessor("xpath").getName());
}
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=390430&r1=390429&r2=390430&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 06:27:20 2006
@@ -29,11 +29,12 @@
public class AddressingProcessorTest extends TestCase {
public void testAddressingProcessor() throws Exception {
+ SynapseEnvironment env = new Axis2SynapseEnvironment(null,null);
SynapseMessage sm = new Axis2SynapseMessage(
- Axis2EnvSetup.axis2Deployment("target/synapse-repository"));
+
Axis2EnvSetup.axis2Deployment("target/synapse-repository"),env);
Mediator addressingMediator = new AddressingInMediator();
- SynapseEnvironment env = new Axis2SynapseEnvironment(null,null);
- sm.setSynapseEnvironment(env);
+
+
boolean result = addressingMediator.mediate(sm);
assertTrue(((Boolean) sm.getProperty(
Constants.MEDIATOR_RESPONSE_PROPERTY)).booleanValue());
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=390430&r1=390429&r2=390430&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 06:27:20 2006
@@ -1,9 +1,12 @@
package org.apache.synapse.spi.processors;
import junit.framework.TestCase;
+
+import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseMessage;
import org.apache.synapse.util.Axis2EnvSetup;
import org.apache.synapse.api.Mediator;
+import org.apache.synapse.axis2.Axis2SynapseEnvironment;
import org.apache.synapse.axis2.Axis2SynapseMessage;
import org.apache.synapse.mediators.builtin.LogMediator;
/*
@@ -25,8 +28,9 @@
public class BulitinProcessorTest extends TestCase {
public void testLogProcessor() throws Exception {
+ SynapseEnvironment env = new Axis2SynapseEnvironment(null,null);
SynapseMessage sm = new Axis2SynapseMessage(
- Axis2EnvSetup.axis2Deployment("target/synapse-repository"));
+
Axis2EnvSetup.axis2Deployment("target/synapse-repository"),env);
Mediator log = new LogMediator();
boolean result = log.mediate(sm);
assertTrue(result);
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=390430&r1=390429&r2=390430&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 06:27:20 2006
@@ -1,9 +1,12 @@
package org.apache.synapse.spi.processors;
import junit.framework.TestCase;
+
+import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseMessage;
import org.apache.synapse.mediators.types.ClassMediator;
import org.apache.synapse.util.Axis2EnvSetup;
+import org.apache.synapse.axis2.Axis2SynapseEnvironment;
import org.apache.synapse.axis2.Axis2SynapseMessage;
/*
* Copyright 2004,2005 The Apache Software Foundation.
@@ -24,8 +27,9 @@
public class ClassMediatorProcessorTest extends TestCase {
public void testClassMediatorProcessor() throws Exception {
+ SynapseEnvironment env = new Axis2SynapseEnvironment(null,null);
SynapseMessage sm = new Axis2SynapseMessage(
- Axis2EnvSetup.axis2Deployment("target/synapse-repository"));
+
Axis2EnvSetup.axis2Deployment("target/synapse-repository"),env);
ClassMediator med = new ClassMediator();
med.setClazz(Class.forName("org.apache.synapse.mediators.LoggerTestSample"));
boolean result = med.mediate(sm);
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=390430&r1=390429&r2=390430&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 06:27:20 2006
@@ -3,8 +3,10 @@
import junit.framework.TestCase;
import org.apache.synapse.mediators.base.InMediator;
+import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseMessage;
import org.apache.synapse.util.Axis2EnvSetup;
+import org.apache.synapse.axis2.Axis2SynapseEnvironment;
import org.apache.synapse.axis2.Axis2SynapseMessage;
/*
* Copyright 2004,2005 The Apache Software Foundation.
@@ -26,8 +28,9 @@
public class InProcessorTest extends TestCase {
public void testInProcessor() throws Exception {
+ SynapseEnvironment env = new Axis2SynapseEnvironment(null,null);
SynapseMessage sm = new Axis2SynapseMessage(
- Axis2EnvSetup.axis2Deployment("target/synapse-repository"));
+
Axis2EnvSetup.axis2Deployment("target/synapse-repository"),env);
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=390430&r1=390429&r2=390430&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 06:27:20 2006
@@ -2,8 +2,10 @@
import junit.framework.TestCase;
import org.apache.synapse.util.Axis2EnvSetup;
+import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseMessage;
import org.apache.synapse.mediators.rules.RegexMediator;
+import org.apache.synapse.axis2.Axis2SynapseEnvironment;
import org.apache.synapse.axis2.Axis2SynapseMessage;
import org.apache.axis2.addressing.EndpointReference;
/*
@@ -25,7 +27,8 @@
public class RegexProcessorTest extends TestCase {
public void testRegexProcessor() throws Exception {
- SynapseMessage sm = new
Axis2SynapseMessage(Axis2EnvSetup.axis2Deployment("target/synapse-repository"));
+ SynapseEnvironment env = new Axis2SynapseEnvironment(null,null);
+ SynapseMessage sm = new
Axis2SynapseMessage(Axis2EnvSetup.axis2Deployment("target/synapse-repository"),env);
sm.setTo(new EndpointReference("http://xmethods.org";));
RegexMediator med = new RegexMediator();
med.setPattern("http://xmethods..\\*";);
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=390430&r1=390429&r2=390430&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 06:27:20 2006
@@ -1,9 +1,12 @@
package org.apache.synapse.spi.processors;
import junit.framework.TestCase;
+
+import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseMessage;
import org.apache.synapse.mediators.types.axis2.ServiceMediator;
import org.apache.synapse.util.Axis2EnvSetup;
+import org.apache.synapse.axis2.Axis2SynapseEnvironment;
import org.apache.synapse.axis2.Axis2SynapseMessage;
/*
* Copyright 2004,2005 The Apache Software Foundation.
@@ -24,8 +27,9 @@
public class ServiceMediatorProcessorTest extends TestCase {
public void testServiceMediatorProcessor() throws Exception {
+ SynapseEnvironment env = new Axis2SynapseEnvironment(null,null);
SynapseMessage sm = new Axis2SynapseMessage(
-
Axis2EnvSetup.axis2Deployment("target/synapse-repository-sendonAxis2"));
+
Axis2EnvSetup.axis2Deployment("target/synapse-repository-sendonAxis2"),env);
ServiceMediator med = new ServiceMediator();
med.setServiceName("test-mediator");
boolean result = med.mediate(sm);
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=390430&r1=390429&r2=390430&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 06:27:20 2006
@@ -21,8 +21,10 @@
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.SynapseEnvironment;
import org.apache.synapse.SynapseMessage;
import org.apache.synapse.util.Axis2EnvSetup;
+import org.apache.synapse.axis2.Axis2SynapseEnvironment;
import org.apache.synapse.axis2.Axis2SynapseMessage;
import java.util.List;
@@ -30,8 +32,9 @@
public class StageProcessorTest extends TestCase {
public void testStageProcessor() throws Exception {
+ SynapseEnvironment env = new Axis2SynapseEnvironment(null,null);
SynapseMessage sm = new Axis2SynapseMessage(
- Axis2EnvSetup.axis2Deployment("target/synapse-repository"));
+
Axis2EnvSetup.axis2Deployment("target/synapse-repository"),env);
StageMediator med = new StageMediator();
boolean result = med.mediate(sm);
assertTrue(result);
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=390430&r1=390429&r2=390430&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 06:27:20 2006
@@ -46,8 +46,9 @@
public void testXSLTProcessor() throws Exception {
+ SynapseEnvironment env = new Axis2SynapseEnvironment(null,null);
SynapseMessage sm = new Axis2SynapseMessage(
- Axis2EnvSetup.axis2Deployment("target/synapse-repository"));
+
Axis2EnvSetup.axis2Deployment("target/synapse-repository"),env);
XSLTMediator med = new XSLTMediator();
med.setXSLInputStream(new ByteArrayInputStream(xsl.getBytes()));
med.setIsBody(true);
@@ -72,7 +73,7 @@
assertNotNull(env.getMasterMediator());
SynapseMessage sm = new Axis2SynapseMessage(
- Axis2EnvSetup.axis2Deployment("target/synapse-repository"));
+
Axis2EnvSetup.axis2Deployment("target/synapse-repository"),env);
// throws exceptions if anything goes wrong
env.injectMessage(sm);
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=390430&r1=390429&r2=390430&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 06:27:20 2006
@@ -17,15 +17,19 @@
package org.apache.synapse.spi.processors;
import junit.framework.TestCase;
+
+import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseMessage;
+import org.apache.synapse.axis2.Axis2SynapseEnvironment;
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 {
+ SynapseEnvironment env = new Axis2SynapseEnvironment(null,null);
SynapseMessage sm = new Axis2SynapseMessage(
- Axis2EnvSetup.axis2Deployment("target/synapse-repository"));
+
Axis2EnvSetup.axis2Deployment("target/synapse-repository"),env);
XPathMediator med = new XPathMediator();
med.setXPathExpr("//ns:text");
med.addXPathNamespace("ns", "urn:text-body");
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=390430&r1=390429&r2=390430&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 06:27:20 2006
@@ -59,8 +59,8 @@
}
public void testSimpleResourcesHandler() throws Exception {
- SynapseMessage smc = new Axis2SynapseMessage(msgCtx);
- //env.injectMessage(smc);
+ SynapseMessage smc = new Axis2SynapseMessage(msgCtx,env);
+ env.injectMessage(smc);
}
}
Modified:
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spi/injection/SpringMediatorProcessorWithRuleTest.java
URL:
http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spi/injection/SpringMediatorProcessorWithRuleTest.java?rev=390430&r1=390429&r2=390430&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spi/injection/SpringMediatorProcessorWithRuleTest.java
(original)
+++
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spi/injection/SpringMediatorProcessorWithRuleTest.java
Fri Mar 31 06:27:20 2006
@@ -50,7 +50,7 @@
public void testSpringProcessor() throws Exception {
- SynapseMessage smc = new Axis2SynapseMessage(msgCtx);
+ SynapseMessage smc = new Axis2SynapseMessage(msgCtx,env);
env.injectMessage(smc);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
