You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by sa...@apache.org on 2006/03/26 13:03:30 UTC
svn commit: r388894 [3/3] - in /incubator/synapse/trunk/java: etc/
modules/core/ modules/core/src/org/apache/synapse/
modules/core/src/org/apache/synapse/axis2/
modules/core/src/org/apache/synapse/processors/builtin/
modules/core/src/org/apache/synapse...
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/FaultProcessorWithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/FaultProcessorWithRuleTest.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/FaultProcessorWithRuleTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/FaultProcessorWithRuleTest.java Sun Mar 26 03:03:22 2006
@@ -23,6 +23,8 @@
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.transport.http.SimpleHTTPServer;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.synapse.util.Axis2EnvSetup;
@@ -37,8 +39,11 @@
"http://127.0.0.1:5043/axis2/services/anonymous");
public void setUp() throws Exception {
+ ConfigurationContext context = ConfigurationContextFactory
+ .createConfigurationContextFromFileSystem(
+ "target/synapse-repository-fault", null);
synapseServer =
- new SimpleHTTPServer("target/synapse-repository-fault", 5043);
+ new SimpleHTTPServer(context, 5043);
synapseServer.start();
}
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/HTTPToTCPMessageMediationTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/HTTPToTCPMessageMediationTest.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/HTTPToTCPMessageMediationTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/HTTPToTCPMessageMediationTest.java Sun Mar 26 03:03:22 2006
@@ -6,8 +6,10 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.client.Options;
-import org.apache.axis2.om.OMElement;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.synapse.util.Axis2EnvSetup;
+import org.apache.axiom.om.OMElement;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -32,9 +34,12 @@
"http://127.0.0.1:5043/axis2/services/anonymous");
public void setUp() throws Exception {
+ ConfigurationContext synapseServerContext = ConfigurationContextFactory
+ .createConfigurationContextFromFileSystem(
+ "target/synapse-repository-httptcp", null);
+
synapseServer =
- new SimpleHTTPServer("target/synapse-repository-httptcp",
- 5043);
+ new SimpleHTTPServer(synapseServerContext,5043);
/**
* axis2TcpServer is the one who holds the actual service
*/
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=388894&r1=388893&r2=388894&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 Sun Mar 26 03:03:22 2006
@@ -3,7 +3,6 @@
import junit.framework.TestCase;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.om.OMElement;
import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseMessage;
import org.apache.synapse.Processor;
@@ -12,6 +11,7 @@
import org.apache.synapse.axis2.Axis2SynapseMessage;
import org.apache.synapse.axis2.Axis2SynapseEnvironment;
import org.apache.synapse.util.Axis2EnvSetup;
+import org.apache.axiom.om.OMElement;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/SendBackProcessorWithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/SendBackProcessorWithRuleTest.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/SendBackProcessorWithRuleTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/SendBackProcessorWithRuleTest.java Sun Mar 26 03:03:22 2006
@@ -22,6 +22,8 @@
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.transport.http.SimpleHTTPServer;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.synapse.util.Axis2EnvSetup;
@@ -31,8 +33,10 @@
"http://127.0.0.1:5043/axis2/services/anonymous");
public void setUp() throws Exception {
- synapseServer = new SimpleHTTPServer("target/synapse-repository-send",
- 5043);
+ ConfigurationContext context = ConfigurationContextFactory
+ .createConfigurationContextFromFileSystem(
+ "target/synapse-repository-send", null);
+ synapseServer = new SimpleHTTPServer(context, 5043);
synapseServer.start();
}
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/SendNowProcessorWithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/SendNowProcessorWithRuleTest.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/SendNowProcessorWithRuleTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/SendNowProcessorWithRuleTest.java Sun Mar 26 03:03:22 2006
@@ -21,8 +21,10 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.client.Options;
-import org.apache.axis2.om.OMElement;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.synapse.util.Axis2EnvSetup;
+import org.apache.axiom.om.OMElement;
/*
*/
@@ -33,14 +35,18 @@
"http://127.0.0.1:5043/axis2/services/anonymous");
public void setUp() throws Exception {
- synapseServer = new SimpleHTTPServer("target/synapse-repository-sendnow",
- 5043);
+ ConfigurationContext synapseServerContext = ConfigurationContextFactory
+ .createConfigurationContextFromFileSystem(
+ "target/synapse-repository-sendnow", null);
+ ConfigurationContext serverContext = ConfigurationContextFactory
+ .createConfigurationContextFromFileSystem(
+ "target/synapse-repository-sendonAxis2", null);
+ synapseServer = new SimpleHTTPServer(synapseServerContext,5043);
/**
* axis2Server is the one who holds the actual service
*/
axis2Server =
- new SimpleHTTPServer("target/synapse-repository-sendonAxis2",
- 8090);
+ new SimpleHTTPServer(serverContext,8090);
synapseServer.start();
axis2Server.start();
}
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/SendOnProcessorWithAddressingEngageWithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/SendOnProcessorWithAddressingEngageWithRuleTest.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/SendOnProcessorWithAddressingEngageWithRuleTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/SendOnProcessorWithAddressingEngageWithRuleTest.java Sun Mar 26 03:03:22 2006
@@ -4,8 +4,10 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.om.OMElement;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.synapse.util.Axis2EnvSetup;
+import org.apache.axiom.om.OMElement;
import junit.framework.TestCase;
@@ -33,14 +35,18 @@
"http://127.0.0.1:5043/axis2/services/anonymous");
public void setUp() throws Exception {
- synapseServer = new SimpleHTTPServer("target/synapse-repository-sendon",
- 5043);
+ ConfigurationContext synapseServerContext = ConfigurationContextFactory
+ .createConfigurationContextFromFileSystem(
+ "target/synapse-repository-sendon", null);
+ ConfigurationContext serverContext = ConfigurationContextFactory
+ .createConfigurationContextFromFileSystem(
+ "target/synapse-repository-sendonAxis2", null);
+ synapseServer = new SimpleHTTPServer(synapseServerContext,5043);
/**
* axis2Server is the one who holds the actual service
*/
axis2Server =
- new SimpleHTTPServer("target/synapse-repository-sendonAxis2",
- 8090);
+ new SimpleHTTPServer(serverContext,8090);
synapseServer.start();
axis2Server.start();
}
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/SendOnProcessorWithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/SendOnProcessorWithRuleTest.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/SendOnProcessorWithRuleTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/SendOnProcessorWithRuleTest.java Sun Mar 26 03:03:22 2006
@@ -22,8 +22,12 @@
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.transport.http.SimpleHTTPServer;
-import org.apache.axis2.om.OMElement;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.synapse.util.Axis2EnvSetup;
+import org.apache.axiom.om.OMElement;
+
+import javax.xml.namespace.QName;
public class SendOnProcessorWithRuleTest extends TestCase {
@@ -34,14 +38,18 @@
"http://127.0.0.1:5043/axis2/services/anonymous");
public void setUp() throws Exception {
- synapseServer = new SimpleHTTPServer("target/synapse-repository-sendon",
- 5043);
+ ConfigurationContext synapseServerContext = ConfigurationContextFactory
+ .createConfigurationContextFromFileSystem(
+ "target/synapse-repository-sendon", null);
+ ConfigurationContext serverContext = ConfigurationContextFactory
+ .createConfigurationContextFromFileSystem(
+ "target/synapse-repository-sendonAxis2", null);
+ synapseServer = new SimpleHTTPServer(synapseServerContext, 5043);
/**
* axis2Server is the one who holds the actual service
*/
axis2Server =
- new SimpleHTTPServer("target/synapse-repository-sendonAxis2",
- 8090);
+ new SimpleHTTPServer(serverContext, 8090);
synapseServer.start();
axis2Server.start();
}
@@ -58,6 +66,7 @@
Options options = new Options();
options.setTo(targetEpr);
serviceClient.setOptions(options);
+ serviceClient.disEngageModule(new QName("addressing"));
OMElement response = serviceClient.sendReceive(Axis2EnvSetup.payload());
assertEquals("Synapse Testing String_Response", response.getText());
@@ -66,11 +75,12 @@
public void testSendProcessorMultipleTimes() throws Exception {
for (int i = 0; i < 10; i++) {
ServiceClient serviceClient = new ServiceClient(
- Axis2EnvSetup.createConfigurationContextFromFileSystem(
- "target/synapse-repository-sendon"), null);
+ Axis2EnvSetup.createConfigurationContextFromFileSystem(
+ "target/synapse-repository-sendon"), null);
Options options = new Options();
options.setTo(targetEpr);
serviceClient.setOptions(options);
+ serviceClient.disEngageModule(new QName("addressing"));
OMElement response =
serviceClient.sendReceive(Axis2EnvSetup.payload());
assertEquals("Synapse Testing String_Response", response.getText());
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=388894&r1=388893&r2=388894&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 Sun Mar 26 03:03:22 2006
@@ -2,12 +2,12 @@
import junit.framework.TestCase;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.om.OMElement;
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.util.Axis2EnvSetup;
+import org.apache.axiom.om.OMElement;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
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=388894&r1=388893&r2=388894&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 Sun Mar 26 03:03:22 2006
@@ -2,7 +2,6 @@
import junit.framework.TestCase;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.om.OMElement;
import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseMessage;
import org.apache.synapse.Processor;
@@ -11,6 +10,7 @@
import org.apache.synapse.axis2.Axis2SynapseEnvironment;
import org.apache.synapse.axis2.Axis2SynapseMessage;
import org.apache.synapse.util.Axis2EnvSetup;
+import org.apache.axiom.om.OMElement;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
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=388894&r1=388893&r2=388894&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 Sun Mar 26 03:03:22 2006
@@ -2,7 +2,6 @@
import junit.framework.TestCase;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.om.OMElement;
import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseMessage;
import org.apache.synapse.Processor;
@@ -11,6 +10,7 @@
import org.apache.synapse.axis2.Axis2SynapseEnvironment;
import org.apache.synapse.axis2.Axis2SynapseMessage;
import org.apache.synapse.util.Axis2EnvSetup;
+import org.apache.axiom.om.OMElement;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/FaultProcessorTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/FaultProcessorTest.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/FaultProcessorTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/FaultProcessorTest.java Sun Mar 26 03:03:22 2006
@@ -24,6 +24,8 @@
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.synapse.util.Axis2EnvSetup;
import javax.xml.namespace.QName;
@@ -38,8 +40,8 @@
private QName operation = new QName("anonymous");
public void setUp() throws Exception {
- synapseServer = new SimpleHTTPServer("target/synapse-repository-fault",
- 5043);
+ ConfigurationContext context = ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/synapse-repository-fault",null);
+ synapseServer = new SimpleHTTPServer(context,5043);
synapseServer.start();
}
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=388894&r1=388893&r2=388894&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 Sun Mar 26 03:03:22 2006
@@ -1,13 +1,15 @@
package org.apache.synapse.spi.resources;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.om.OMElement;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.transport.http.SimpleHTTPServer;
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.util.Axis2EnvSetup;
+import org.apache.axiom.om.OMElement;
import junit.framework.TestCase;
/*
* Copyright 2004,2005 The Apache Software Foundation.
@@ -30,11 +32,11 @@
private SynapseEnvironment env;
private OMElement config;
private String synapsexml =
- "<synapse xmlns=\"http://ws.apache.org/ns/synapse\">\n" +
- "<resource type=\"org.apache.synapse.resources.http.SimpleGETResourceHandler\" uri-root=\"http://127.0.0.1:8090/axis2/services/npe/simple_resources\">\n"+
- "<property name=\"http.username\">paul</property>"+
- "<property name=\"http.password\">pass</property>"+
- "</resource>\n"+
+ "<synapse xmlns=\"http://ws.apache.org/ns/synapse\">\n" +
+ "<resource type=\"org.apache.synapse.resources.http.SimpleGETResourceHandler\" uri-root=\"http://127.0.0.1:8090/axis2/services/npe/simple_resources\">\n" +
+ "<property name=\"http.username\">paul</property>" +
+ "<property name=\"http.password\">pass</property>" +
+ "</resource>\n" +
"<classmediator class=\"org.apache.synapse.mediators.SimpleGETResourceAquiringMediator\"/>\n" +
"</synapse>";
@@ -45,13 +47,17 @@
config = Axis2EnvSetup.getSynapseConfigElement(synapsexml);
env = new Axis2SynapseEnvironment(config,
Thread.currentThread().getContextClassLoader());
- resources = new SimpleHTTPServer("target/synapse-repository-resources",8090);
+ ConfigurationContext context = ConfigurationContextFactory
+ .createConfigurationContextFromFileSystem(
+ "target/synapse-repository-resources", null);
+ resources = new SimpleHTTPServer(context, 8090);
resources.start();
}
protected void tearDown() throws Exception {
resources.stop();
}
+
public void testSimpleResourcesHandler() throws Exception {
SynapseMessage smc = new Axis2SynapseMessage(msgCtx);
env.injectMessage(smc);
Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/util/Axis2EnvSetup.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/util/Axis2EnvSetup.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/util/Axis2EnvSetup.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/util/Axis2EnvSetup.java Sun Mar 26 03:03:22 2006
@@ -9,10 +9,10 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.InOutAxisOperation;
import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.om.*;
-import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
-import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.synapse.axis2.SynapseMessageReceiver;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.om.*;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
@@ -39,9 +39,9 @@
public class Axis2EnvSetup {
public static MessageContext axis2Deployment(String testingRepository)
throws AxisFault {
- ConfigurationContextFactory conFac = new ConfigurationContextFactory();
- ConfigurationContext configCtx = conFac
- .createConfigurationContextFromFileSystem(testingRepository);
+ final ConfigurationContext configCtx = ConfigurationContextFactory
+ .createConfigurationContextFromFileSystem(testingRepository,
+ null);
MessageContext msgCtx = new MessageContext();
msgCtx.setConfigurationContext(configCtx);
msgCtx.setEnvelope(testEnvSetup());
@@ -98,14 +98,16 @@
method.addChild(value);
return method;
}
- public static OMElement payloadNamedAdddressing() {
+
+ public static OMElement payloadNamedAdddressing() {
OMFactory fac = OMAbstractFactory.getOMFactory();
OMNamespace omNs = fac.createOMNamespace(
"urn:text-body", "ns");
OMElement method = fac.createOMElement("service", omNs);
OMElement value = fac.createOMElement("text_addressing", omNs);
value.addChild(
- fac.createText(value, "Synapse Testing String Through Addressing"));
+ fac.createText(value,
+ "Synapse Testing String Through Addressing"));
method.addChild(value);
return method;
}
@@ -122,10 +124,10 @@
return method;
}
- public static ConfigurationContext createConfigurationContextFromFileSystem(String repository) throws AxisFault {
- ConfigurationContextFactory fac = new ConfigurationContextFactory();
- ConfigurationContext configContext =
- fac.createConfigurationContextFromFileSystem(repository);
- return configContext;
+ public static ConfigurationContext createConfigurationContextFromFileSystem(
+ String repository) throws AxisFault {
+
+ return ConfigurationContextFactory
+ .createConfigurationContextFromFileSystem(repository, null);
}
}
Modified: incubator/synapse/trunk/java/modules/core/test/rules/synapse-sendon.xml
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/rules/synapse-sendon.xml?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/rules/synapse-sendon.xml (original)
+++ incubator/synapse/trunk/java/modules/core/test/rules/synapse-sendon.xml Sun Mar 26 03:03:22 2006
@@ -1,6 +1,7 @@
<synapse xmlns="http://ws.apache.org/ns/synapse">
<stage name="xpath">
<xpath expr="//ns:text" xmlns:ns="urn:text-body">
+ <engage-addressing-out/>
<classmediator name="simpleRouting" class="org.apache.synapse.mediators.SampleRouter"/>
<send/>
</xpath>
Modified: incubator/synapse/trunk/java/modules/extensions/project.xml
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/extensions/project.xml?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/project.xml (original)
+++ incubator/synapse/trunk/java/modules/extensions/project.xml Sun Mar 26 03:03:22 2006
@@ -20,162 +20,6 @@
<!-- external JARs -->
<dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-core</artifactId>
- <version>${axis2.version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>${commons.httpclient.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-discovery</groupId>
- <artifactId>commons-discovery</artifactId>
- <version>${commons.discovery.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons.codec.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>${stax.impl.groupid}</groupId>
- <artifactId>${stax.impl.artifactid}</artifactId>
- <version>${stax.impl.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>${stax.api.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-wsdl4j</artifactId>
- <version>${axis.wsdl4j.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-javamail</artifactId>
- <version>${geronimo.spec.javamail.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-activation</artifactId>
- <version>${geronimo.spec.activation.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jms</artifactId>
- <version>${geronimo.spec.jms.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <properties>
- <classloader>root</classloader>
- </properties>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>${jaxen.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.6.0</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- <version>${annogen.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>${XmlSchema.version}</version>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>policy</artifactId>
- <version>${policy.version}</version>
- <properties>
- <module>false</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>axiom</artifactId>
- <version>${axiom.version}</version>
- <properties>
- <module>false</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>${backport_util_concurrent.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<version>${spring.version}</version>
Modified: incubator/synapse/trunk/java/modules/extensions/src/META-INF/services/org.apache.synapse.xml.ProcessorConfigurator
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/extensions/src/META-INF/services/org.apache.synapse.xml.ProcessorConfigurator?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/META-INF/services/org.apache.synapse.xml.ProcessorConfigurator (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/META-INF/services/org.apache.synapse.xml.ProcessorConfigurator Sun Mar 26 03:03:22 2006
@@ -1 +1,2 @@
-org.apache.synapse.processors.mediatortypes.spring.SpringMediatorProcessorConfigurator
\ No newline at end of file
+org.apache.synapse.processors.mediatortypes.spring.SpringMediatorProcessorConfigurator
+org.apache.synapse.processors.conditions.SwitchProcessorConfigurator
\ No newline at end of file
Modified: incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/processors/mediatortypes/spring/SpringMediatorProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/processors/mediatortypes/spring/SpringMediatorProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/processors/mediatortypes/spring/SpringMediatorProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/processors/mediatortypes/spring/SpringMediatorProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -7,8 +7,6 @@
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.axis2.om.OMAttribute;
-import org.apache.axis2.om.OMElement;
import org.apache.synapse.xml.Constants;
import org.apache.synapse.Processor;
import org.apache.synapse.SynapseEnvironment;
@@ -17,6 +15,8 @@
import org.apache.synapse.xml.AbstractProcessorConfigurator;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMAttribute;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.io.ByteArrayResource;
Modified: incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/extensions/utils/Axis2EnvSetup.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/extensions/utils/Axis2EnvSetup.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/extensions/utils/Axis2EnvSetup.java (original)
+++ incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/extensions/utils/Axis2EnvSetup.java Sun Mar 26 03:03:22 2006
@@ -4,18 +4,18 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.om.OMFactory;
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMDocument;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
-import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.InOutAxisOperation;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.synapse.axis2.SynapseMessageReceiver;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMDocument;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
@@ -29,9 +29,8 @@
public class Axis2EnvSetup {
public static MessageContext axis2Deployment(String testingRepository)
throws AxisFault {
- ConfigurationContextFactory conFac = new ConfigurationContextFactory();
- ConfigurationContext configCtx = conFac
- .createConfigurationContextFromFileSystem(testingRepository);
+ final ConfigurationContext configCtx = ConfigurationContextFactory
+ .createConfigurationContextFromFileSystem(testingRepository,null);
MessageContext msgCtx = new MessageContext();
msgCtx.setConfigurationContext(configCtx);
msgCtx.setEnvelope(testEnvSetup());
@@ -72,8 +71,7 @@
new ByteArrayInputStream(synapseXml.getBytes()));
OMFactory fac = OMAbstractFactory.getOMFactory();
StAXOMBuilder staxBuilder = new StAXOMBuilder(fac, parser);
- OMElement config = staxBuilder.getDocumentElement();
- return config;
+ return staxBuilder.getDocumentElement();
}
}
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=388894&r1=388893&r2=388894&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 Sun Mar 26 03:03:22 2006
@@ -1,12 +1,12 @@
package org.apache.synapse.spi.injection;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.om.OMElement;
import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseMessage;
import org.apache.synapse.extensions.utils.Axis2EnvSetup;
import org.apache.synapse.axis2.Axis2SynapseEnvironment;
import org.apache.synapse.axis2.Axis2SynapseMessage;
+import org.apache.axiom.om.OMElement;
import junit.framework.TestCase;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: incubator/synapse/trunk/java/modules/mediators/project.xml
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/mediators/project.xml?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/mediators/project.xml (original)
+++ incubator/synapse/trunk/java/modules/mediators/project.xml Sun Mar 26 03:03:22 2006
@@ -26,166 +26,6 @@
<version>${pom.currentVersion}</version>
</dependency>
-
-
-
- <!-- external JARs -->
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-core</artifactId>
- <version>${axis2.version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>${commons.httpclient.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-discovery</groupId>
- <artifactId>commons-discovery</artifactId>
- <version>${commons.discovery.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons.codec.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>${stax.impl.groupid}</groupId>
- <artifactId>${stax.impl.artifactid}</artifactId>
- <version>${stax.impl.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>${stax.api.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-wsdl4j</artifactId>
- <version>${axis.wsdl4j.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-javamail</artifactId>
- <version>${geronimo.spec.javamail.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-activation</artifactId>
- <version>${geronimo.spec.activation.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jms</artifactId>
- <version>${geronimo.spec.jms.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <properties>
- <classloader>root</classloader>
- </properties>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>${jaxen.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.6.0</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- <version>${annogen.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>${XmlSchema.version}</version>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>policy</artifactId>
- <version>${policy.version}</version>
- <properties>
- <module>false</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>axiom</artifactId>
- <version>${axiom.version}</version>
- <properties>
- <module>false</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>${backport_util_concurrent.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
</dependencies>
<build>
Modified: incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/deprecation/DeprecationConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/deprecation/DeprecationConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/deprecation/DeprecationConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/deprecation/DeprecationConfigurator.java Sun Mar 26 03:03:22 2006
@@ -17,8 +17,8 @@
package org.apache.synapse.mediators.deprecation;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import javax.xml.namespace.QName;
import java.io.InputStream;
Modified: incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/sla/SLAConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/sla/SLAConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/sla/SLAConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/sla/SLAConfigurator.java Sun Mar 26 03:03:22 2006
@@ -16,11 +16,12 @@
package org.apache.synapse.mediators.sla;
-import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
-import org.apache.axis2.om.OMElement;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.OMElement;
+
import javax.xml.namespace.QName;
import java.util.Map;
import java.util.HashMap;
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=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/samples/src/sampleMediators/Logger.java (original)
+++ incubator/synapse/trunk/java/modules/samples/src/sampleMediators/Logger.java Sun Mar 26 03:03:22 2006
@@ -15,9 +15,9 @@
*/
package sampleMediators;
-import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.synapse.SynapseMessage;
import org.apache.synapse.api.Mediator;
+import org.apache.axiom.soap.SOAPEnvelope;
/**
*
@@ -27,26 +27,26 @@
*/
public class Logger implements Mediator {
- /*
- * (non-Javadoc)
- *
- * @see org.apache.synapse.mediator.Mediator#mediate(org.apache.axis2.context.MessageContext)
- */
- public boolean mediate(SynapseMessage mc) {
- System.out.println("Logger.mediate:");
- if (mc.getTo() != null && mc.getTo().getAddress() != null)
- System.out.println("Logger.mediate to:" + mc.getTo().getAddress());
- else
- System.out.println("Empty To");
- if (mc.getReplyTo() != null && mc.getReplyTo().getAddress() != null)
- System.out.println("Logger.mediate ReplyTo:"
- + mc.getReplyTo().getAddress());
- else
- System.out.println("Empty ReplyTo");
- SOAPEnvelope env = mc.getEnvelope();
- System.out.println(env.toString());
- System.out.println();
- return true;
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.synapse.mediator.Mediator#mediate(org.apache.axis2.context.MessageContext)
+ */
+ public boolean mediate(SynapseMessage mc) {
+ System.out.println("Logger.mediate:");
+ if (mc.getTo() != null && mc.getTo().getAddress() != null)
+ System.out.println("Logger.mediate to:" + mc.getTo().getAddress());
+ else
+ System.out.println("Empty To");
+ if (mc.getReplyTo() != null && mc.getReplyTo().getAddress() != null)
+ System.out.println("Logger.mediate ReplyTo:"
+ + mc.getReplyTo().getAddress());
+ else
+ System.out.println("Empty ReplyTo");
+ SOAPEnvelope env = mc.getEnvelope();
+ System.out.println(env.toString());
+ System.out.println();
+ return true;
+ }
}
Modified: incubator/synapse/trunk/java/modules/samples/src/samples/userguide/DumbStockQuoteClient.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/samples/src/samples/userguide/DumbStockQuoteClient.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/samples/src/samples/userguide/DumbStockQuoteClient.java (original)
+++ incubator/synapse/trunk/java/modules/samples/src/samples/userguide/DumbStockQuoteClient.java Sun Mar 26 03:03:22 2006
@@ -8,7 +8,7 @@
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.om.OMElement;
+import org.apache.axiom.om.OMElement;
public class DumbStockQuoteClient {
@@ -45,10 +45,9 @@
try {
ServiceClient serviceClient;
if (repository) {
- ConfigurationContextFactory fac =
- new ConfigurationContextFactory();
+
ConfigurationContext configContext =
- fac.createConfigurationContextFromFileSystem(args[2]);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem(args[2],null);
serviceClient = new ServiceClient(configContext, null);
} else {
serviceClient = new ServiceClient();
@@ -66,7 +65,7 @@
Options options = new Options();
options.setTo(targetEPR);
- options.setSoapAction("http://www.webserviceX.NET/GetQuote");
+ options.setAction("http://www.webserviceX.NET/GetQuote");
// create a lightweight Axis Config with no addressing to
// demonstrate "dumb" SOAP
@@ -76,7 +75,7 @@
options.setProperty(
Constants.Configuration.DISABLE_ADDRESSING_FOR_OUT_MESSAGES,
- new Boolean(true));
+ Boolean.TRUE);
serviceClient.setOptions(options);
// step 3 - Blocking invocation
Modified: incubator/synapse/trunk/java/modules/samples/src/samples/userguide/ProxyStockQuoteClient.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/samples/src/samples/userguide/ProxyStockQuoteClient.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/samples/src/samples/userguide/ProxyStockQuoteClient.java (original)
+++ incubator/synapse/trunk/java/modules/samples/src/samples/userguide/ProxyStockQuoteClient.java Sun Mar 26 03:03:22 2006
@@ -10,8 +10,8 @@
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.transport.http.HttpTransportProperties;
+import org.apache.axiom.om.OMElement;
-import org.apache.axis2.om.OMElement;
public class ProxyStockQuoteClient {
@@ -68,7 +68,7 @@
ConfigurationContextFactory fac =
new ConfigurationContextFactory();
ConfigurationContext configContext =
- fac.createConfigurationContextFromFileSystem(args[3]);
+ fac.createConfigurationContextFromFileSystem(args[3],null);
serviceClient = new ServiceClient(configContext, null);
} else {
serviceClient = new ServiceClient();
Modified: incubator/synapse/trunk/java/modules/samples/src/samples/userguide/StockQuoteClient.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/samples/src/samples/userguide/StockQuoteClient.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/samples/src/samples/userguide/StockQuoteClient.java (original)
+++ incubator/synapse/trunk/java/modules/samples/src/samples/userguide/StockQuoteClient.java Sun Mar 26 03:03:22 2006
@@ -6,8 +6,8 @@
import org.apache.axis2.context.MessageContextConstants;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axiom.om.OMElement;
-import org.apache.axis2.om.OMElement;
public class StockQuoteClient {
@@ -71,10 +71,9 @@
ServiceClient serviceClient;
if (repository) {
- ConfigurationContextFactory fac =
- new ConfigurationContextFactory();
+
ConfigurationContext configContext =
- fac.createConfigurationContextFromFileSystem(args[3]);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem(args[3],null);
serviceClient = new ServiceClient(configContext, null);
} else {
serviceClient = new ServiceClient();
Modified: incubator/synapse/trunk/java/modules/samples/src/samples/userguide/StockQuoteXMLHandler.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/samples/src/samples/userguide/StockQuoteXMLHandler.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/samples/src/samples/userguide/StockQuoteXMLHandler.java (original)
+++ incubator/synapse/trunk/java/modules/samples/src/samples/userguide/StockQuoteXMLHandler.java Sun Mar 26 03:03:22 2006
@@ -1,17 +1,14 @@
package samples.userguide;
+import org.apache.axiom.om.*;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+
import java.io.ByteArrayInputStream;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMFactory;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.om.OMText;
-import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
public class StockQuoteXMLHandler {
@@ -41,7 +38,7 @@
StAXOMBuilder builder = new StAXOMBuilder(new ByteArrayInputStream(
- text.getBytes()));
+ text.getBytes()));
OMElement parse = builder.getDocumentElement();
Modified: incubator/synapse/trunk/java/modules/samples/src/samples/userguide/log/LoggingClient.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/samples/src/samples/userguide/log/LoggingClient.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/samples/src/samples/userguide/log/LoggingClient.java (original)
+++ incubator/synapse/trunk/java/modules/samples/src/samples/userguide/log/LoggingClient.java Sun Mar 26 03:03:22 2006
@@ -20,10 +20,10 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMFactory;
-import org.apache.axis2.om.OMNamespace;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.OMFactory;
public class LoggingClient {
Added: incubator/synapse/trunk/java/repository/conf/axis2.xml
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/repository/conf/axis2.xml?rev=388894&view=auto
==============================================================================
--- incubator/synapse/trunk/java/repository/conf/axis2.xml (added)
+++ incubator/synapse/trunk/java/repository/conf/axis2.xml Sun Mar 26 03:03:22 2006
@@ -0,0 +1,136 @@
+<axisconfig name="AxisJava2.0_Synapse">
+ <!-- ================================================= -->
+ <!-- Parameters -->
+ <!-- ================================================= -->
+ <parameter name="hotdeployment" locked="false">true</parameter>
+ <parameter name="hotupdate" locked="false">false</parameter>
+ <parameter name="enableMTOM" locked="false">true</parameter>
+ <!-- Uncomment this to enable REST support -->
+ <!-- <parameter name="enableREST" locked="false">true</parameter>-->
+
+ <!-- Location of the SynapseRepository -->
+ <parameter name="SynapseConfiguration" locked="false">conf/synapse.xml</parameter>
+
+ <!-- Engage the addressing module -->
+ <!--<module ref="addressing"/>-->
+
+ <parameter name="userName" locked="false">admin</parameter>
+ <parameter name="password" locked="false">axis2</parameter>
+
+ <!-- ================================================= -->
+ <!-- Message Receivers -->
+ <!-- ================================================= -->
+ <!--This is the Deafult Message Receiver for the system , if you want to have MessageReceivers for -->
+ <!--all the other MEP implement it and add the correct entry to here , so that you can refer from-->
+ <!--any operation -->
+ <!--Note : You can ovride this for particular service by adding the same element with your requirement-->
+ <messageReceivers>
+ <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
+ class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
+ <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
+ class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+ </messageReceivers>
+ <!-- ================================================= -->
+ <!-- Transport Ins -->
+ <!-- ================================================= -->
+ <transportReceiver name="http"
+ class="org.apache.axis2.transport.http.SimpleHTTPServer">
+ <parameter name="port" locked="false">6060</parameter>
+ <!--If you want to give your own host address for EPR generation-->
+ <!--uncommet following paramter , and set as you required.-->
+ <!--<parameter name="hostname" locked="false">http://myApp.com/ws</parameter>-->
+ </transportReceiver>
+
+ <transportReceiver name="tcp"
+ class="org.apache.axis2.transport.tcp.TCPServer">
+ <parameter name="port" locked="false">6061</parameter>
+ <!--If you want to give your own host address for EPR generation-->
+ <!--uncommet following paramter , and set as you required.-->
+ <!--<parameter name="hostname" locked="false">tcp://myApp.com/ws</parameter>-->
+ </transportReceiver>
+
+ <!-- ================================================= -->
+ <!-- Transport Outs -->
+ <!-- ================================================= -->
+
+ <transportSender name="tcp"
+ class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+ <transportSender name="local"
+ class="org.apache.axis2.transport.local.LocalTransportSender"/>
+ <transportSender name="jms"
+ class="org.apache.axis2.transport.jms.JMSSender"/>
+ <transportSender name="http"
+ class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+ <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+ </transportSender>
+ <transportSender name="https"
+ class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+ <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+ </transportSender>
+
+ <!-- ================================================= -->
+ <!-- Phases -->
+ <!-- ================================================= -->
+ <phaseOrder type="inflow">
+ <!-- System pre defined phases -->
+ <phase name="TransportIn"/>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <handler name="SynapseDispatcher"
+ class="org.apache.synapse.axis2.SynapseDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <!--SynapseDispatcher will be take control over distpatching thus
+ the default dispatchers will be false through
+ -->
+
+ <!--<handler name="RequestURIBasedDispatcher"-->
+ <!--class="org.apache.axis2.engine.RequestURIBasedDispatcher">-->
+ <!--<order phase="Dispatch"/>-->
+ <!--</handler>-->
+
+ <!--<handler name="SOAPActionBasedDispatcher"-->
+ <!--class="org.apache.axis2.engine.SOAPActionBasedDispatcher">-->
+ <!--<order phase="Dispatch"/>-->
+ <!--</handler>-->
+
+ <!--<handler name="AddressingBasedDispatcher"-->
+ <!--class="org.apache.axis2.engine.AddressingBasedDispatcher">-->
+ <!--<order phase="Dispatch"/>-->
+ <!--</handler>-->
+
+ <!--<handler name="SOAPMessageBodyBasedDispatcher"-->
+ <!--class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">-->
+ <!--<order phase="Dispatch"/>-->
+ <!--</handler>-->
+ <handler name="InstanceDispatcher"
+ class="org.apache.axis2.engine.InstanceDispatcher">
+ <order phase="PostDispatch"/>
+ </handler>
+ </phase>
+ <!-- System pre defined phases -->
+ <!-- After Postdispatch phase module author or or service author can add any phase he want -->
+ <phase name="OperationInPhase"/>
+ </phaseOrder>
+ <phaseOrder type="outflow">
+ <!-- user can add his own phases to this area -->
+ <phase name="OperationOutPhase"/>
+ <!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
+ <phase name="PolicyDetermination"/>
+ <phase name="MessageOut"/>
+ </phaseOrder>
+ <phaseOrder type="INfaultflow">
+ <!-- user can add his own phases to this area -->
+ <phase name="OperationInFaultPhase"/>
+ </phaseOrder>
+ <phaseOrder type="Outfaultflow">
+ <!-- user can add his own phases to this area -->
+ <phase name="OperationOutFaultPhase"/>
+ <phase name="PolicyDetermination"/>
+ <phase name="MessageOut"/>
+ </phaseOrder>
+</axisconfig>
\ No newline at end of file
Added: incubator/synapse/trunk/java/repository/modules/addressing-0.95.mar
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/repository/modules/addressing-0.95.mar?rev=388894&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/synapse/trunk/java/repository/modules/addressing-0.95.mar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org