Repository: ode Updated Branches: refs/heads/ode-1.3.x c5c72831c -> afa1f15d6
ODE-1014: Transport receiver changed from SimpleHTTPServer to AxisServletListener in axis2.xml Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/afa1f15d Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/afa1f15d Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/afa1f15d Branch: refs/heads/ode-1.3.x Commit: afa1f15d670b8207b2312deceb28f5a9fe8255a3 Parents: c5c7283 Author: sathwik <[email protected]> Authored: Thu Jul 24 01:42:24 2014 +0530 Committer: sathwik <[email protected]> Committed: Thu Jul 24 01:42:24 2014 +0530 ---------------------------------------------------------------------- axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml | 2 +- .../src/test/java/org/apache/ode/axis2/Axis2TestBase.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/afa1f15d/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml ---------------------------------------------------------------------- diff --git a/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml b/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml index 706e44d..5241cc3 100644 --- a/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml +++ b/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml @@ -107,7 +107,7 @@ <!-- Transport Ins --> <!-- ================================================= --> <transportReceiver name="http" - class="org.apache.axis2.transport.http.SimpleHTTPServer"> + class="org.apache.axis2.transport.http.AxisServletListener"> <parameter name="port" locked="false">8080</parameter> <!-- Here is the complete list of supported parameters (see example settings further below): port: the port to listen on (default 6060) http://git-wip-us.apache.org/repos/asf/ode/blob/afa1f15d/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java b/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java index 9734bd1..2d464fa 100644 --- a/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java +++ b/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java @@ -46,10 +46,8 @@ import org.apache.axis2.deployment.DeploymentEngine; import org.apache.axis2.deployment.repository.util.ArchiveReader; import org.apache.axis2.description.AxisOperation; import org.apache.axis2.description.AxisService; -import org.apache.axis2.description.Parameter; import org.apache.axis2.description.TransportInDescription; import org.apache.axis2.description.WSDL11ToAxisServiceBuilder; -import org.apache.axis2.engine.AxisConfiguration; import org.apache.axis2.engine.AxisServer; import org.apache.axis2.engine.MessageReceiver; import org.apache.axis2.transport.http.SimpleHTTPServer; @@ -250,8 +248,10 @@ public abstract class Axis2TestBase { } configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(axis2RepoDir, axis2ConfLocation); - // do not use 8080 for tests, and make sure to pass a string, not an int - configContext.getAxisConfiguration().getTransportIn("http").addParameter(new Parameter("port", ""+getTestPort(0))); + + SimpleHTTPServer receiver = new SimpleHTTPServer(configContext, getTestPort(0)); + TransportInDescription trsIn = configContext.getAxisConfiguration().getTransportIn(Constants.TRANSPORT_HTTP); + trsIn.setReceiver(receiver); } protected void start() throws AxisFault {
