Author: veithen
Date: Wed Dec 21 10:29:46 2011
New Revision: 1221664
URL: http://svn.apache.org/viewvc?rev=1221664&view=rev
Log:
Allow Sandesha2 1.4 builds to run concurrently with other Axis2 builds.
Modified:
axis/axis2/java/sandesha/branches/1_4/ (props changed)
axis/axis2/java/sandesha/branches/1_4/modules/tests/pom.xml
axis/axis2/java/sandesha/branches/1_4/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
axis/axis2/java/sandesha/branches/1_4/modules/tests/test-resources/client_axis2.xml
axis/axis2/java/sandesha/branches/1_4/modules/tests/test-resources/client_mtom_axis2.xml
axis/axis2/java/sandesha/branches/1_4/pom.xml
Propchange: axis/axis2/java/sandesha/branches/1_4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 21 10:29:46 2011
@@ -1 +1 @@
-/axis/axis2/java/sandesha/trunk:1050214-1053350
+/axis/axis2/java/sandesha/trunk:1050214-1053350,1220960
Modified: axis/axis2/java/sandesha/branches/1_4/modules/tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/tests/pom.xml?rev=1221664&r1=1221663&r2=1221664&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_4/modules/tests/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_4/modules/tests/pom.xml Wed Dec 21
10:29:46 2011
@@ -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>
Modified:
axis/axis2/java/sandesha/branches/1_4/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java?rev=1221664&r1=1221663&r2=1221664&view=diff
==============================================================================
---
axis/axis2/java/sandesha/branches/1_4/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
(original)
+++
axis/axis2/java/sandesha/branches/1_4/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
Wed Dec 21 10:29:46 2011
@@ -47,6 +47,7 @@ import org.apache.axis2.description.Axis
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 Te
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());
Modified:
axis/axis2/java/sandesha/branches/1_4/modules/tests/test-resources/client_axis2.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/tests/test-resources/client_axis2.xml?rev=1221664&r1=1221663&r2=1221664&view=diff
==============================================================================
---
axis/axis2/java/sandesha/branches/1_4/modules/tests/test-resources/client_axis2.xml
(original)
+++
axis/axis2/java/sandesha/branches/1_4/modules/tests/test-resources/client_axis2.xml
Wed Dec 21 10:29:46 2011
@@ -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)
Modified:
axis/axis2/java/sandesha/branches/1_4/modules/tests/test-resources/client_mtom_axis2.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/tests/test-resources/client_mtom_axis2.xml?rev=1221664&r1=1221663&r2=1221664&view=diff
==============================================================================
---
axis/axis2/java/sandesha/branches/1_4/modules/tests/test-resources/client_mtom_axis2.xml
(original)
+++
axis/axis2/java/sandesha/branches/1_4/modules/tests/test-resources/client_mtom_axis2.xml
Wed Dec 21 10:29:46 2011
@@ -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>-->
Modified: axis/axis2/java/sandesha/branches/1_4/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/pom.xml?rev=1221664&r1=1221663&r2=1221664&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_4/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_4/pom.xml Wed Dec 21 10:29:46 2011
@@ -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>
