Author: midon
Date: Fri Oct 10 12:11:22 2008
New Revision: 703560
URL: http://svn.apache.org/viewvc?rev=703560&view=rev
Log:
ODE-384: set the port programmatically, not in the main axis2.xml file
Modified:
ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
Modified:
ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml?rev=703560&r1=703559&r2=703560&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml
Fri Oct 10 12:11:22 2008
@@ -108,7 +108,7 @@
<!-- ================================================= -->
<transportReceiver name="http"
class="org.apache.axis2.transport.http.SimpleHTTPServer">
- <parameter name="port" locked="false">8888</parameter>
+ <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)
hostname: if non-null, url prefix used in reply-to endpoint
references (default null)
Modified:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java?rev=703560&r1=703559&r2=703560&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
Fri Oct 10 12:11:22 2008
@@ -5,6 +5,7 @@
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.WSDL11ToAxisServiceBuilder;
+import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisServer;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.ode.axis2.hooks.ODEAxisService;
@@ -34,6 +35,8 @@
*/
public abstract class Axis2TestBase {
+ public static final int DEFAULT_TEST_PORT = 8888;
+
protected ODEAxis2Server server;
public void startServer() throws Exception {
@@ -67,6 +70,8 @@
String repoLocation = webappPath + "/WEB-INF";
configContext = ConfigurationContextFactory
.createConfigurationContextFromFileSystem(repoLocation,
confLocation);
+ // do not use 8080 for tests
+
configContext.getAxisConfiguration().getTransportIn("http").addParameter(new
Parameter("port", ""+DEFAULT_TEST_PORT));
}
protected void start() throws AxisFault {