This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_4
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-sandesha.git
commit 40798e2c323c9ec91d31639df2ff7cc58c0c5418
Author: Andreas Veithen <veit...@apache.org>
AuthorDate: Wed Dec 21 10:29:46 2011 +0000
Allow Sandesha2 1.4 builds to run concurrently with other Axis2 builds.
---
modules/tests/pom.xml | 4 ++++
.../tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java | 3 ++-
modules/tests/test-resources/client_axis2.xml | 2 +-
modules/tests/test-resources/client_mtom_axis2.xml | 2 +-
pom.xml | 5 +++++
5 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/modules/tests/pom.xml b/modules/tests/pom.xml
index 8e27166..a8d0039 100644
--- a/modules/tests/pom.xml
+++ b/modules/tests/pom.xml
@@ -174,6 +174,10 @@
<artifactId>axis2-transport-local</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-testutils</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-core</artifactId>
<version>${project.version}</version>
diff --git
a/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
b/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
index d298567..ef4c199 100644
--- a/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
+++ b/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
@@ -47,6 +47,7 @@ import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisOperationFactory;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.engine.MessageReceiver;
+import org.apache.axis2.testutils.PortAllocator;
import org.apache.axis2.transport.http.SimpleHTTPServer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -56,7 +57,7 @@ public class SandeshaTestCase extends TestCase {
String resourceDir = ""; //"test-resources";
Properties properties = null;
final String PROPERTY_FILE_NAME = "sandesha2-test.properties";
- public final int DEFAULT_SERVER_TEST_PORT = 8060;
+ public final int DEFAULT_SERVER_TEST_PORT = PortAllocator.allocatePort();
public ConfigurationContext serverConfigurationContext = null;
private final String RMServiceName = "RMSampleService";
private Log log = LogFactory.getLog(getClass());
diff --git a/modules/tests/test-resources/client_axis2.xml
b/modules/tests/test-resources/client_axis2.xml
index 233a0c5..6acc469 100644
--- a/modules/tests/test-resources/client_axis2.xml
+++ b/modules/tests/test-resources/client_axis2.xml
@@ -127,7 +127,7 @@
<!-- ================================================= -->
<transportReceiver name="http"
class="org.apache.axis2.transport.http.SimpleHTTPServer">
- <parameter name="port">6060</parameter>
+ <parameter name="port">0</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)
diff --git a/modules/tests/test-resources/client_mtom_axis2.xml
b/modules/tests/test-resources/client_mtom_axis2.xml
index b3a2191..a4c7ac1 100644
--- a/modules/tests/test-resources/client_mtom_axis2.xml
+++ b/modules/tests/test-resources/client_mtom_axis2.xml
@@ -88,7 +88,7 @@
<!-- ================================================= -->
<transportReceiver name="http"
class="org.apache.axis2.transport.http.SimpleHTTPServer">
- <parameter name="port" locked="false">6060</parameter>
+ <parameter name="port" locked="false">0</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>-->
diff --git a/pom.xml b/pom.xml
index f27f6ed..e414a9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -406,6 +406,11 @@
<artifactId>axis2-transport-local</artifactId>
<version>${axis2.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-testutils</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
