Author: veithen
Date: Sat Mar 24 10:48:12 2012
New Revision: 1304756
URL: http://svn.apache.org/viewvc?rev=1304756&view=rev
Log:
Avoid using fixed HTTP port in integration tests.
Modified:
axis/axis1/java/trunk/axis-war/pom.xml
Modified: axis/axis1/java/trunk/axis-war/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-war/pom.xml?rev=1304756&r1=1304755&r2=1304756&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-war/pom.xml (original)
+++ axis/axis1/java/trunk/axis-war/pom.xml Sat Mar 24 10:48:12 2012
@@ -83,13 +83,38 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>reserve-network-port</id>
+ <goals>
+ <goal>reserve-network-port</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <portNames>
+
<portName>test.functional.ServicePort</portName>
+ <portName>jetty.stopPort</portName>
+ </portNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>7.5.4.v20111024</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<stopKey>foo</stopKey>
- <stopPort>9999</stopPort>
+ <stopPort>${jetty.stopPort}</stopPort>
+ <connectors>
+ <connector
implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+ <port>${test.functional.ServicePort}</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
<webAppConfig>
<contextPath>/axis</contextPath>
<descriptor>${project.build.directory}/web.xml</descriptor>
@@ -140,7 +165,7 @@
<include>**/*Test.java</include>
</includes>
<systemPropertyVariables>
-
<test.functional.webapp.url>http://localhost:8080/axis</test.functional.webapp.url>
+
<test.functional.webapp.url>http://localhost:${test.functional.ServicePort}/axis</test.functional.webapp.url>
</systemPropertyVariables>
</configuration>
</execution>
