You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by rm...@apache.org on 2013/11/12 13:38:23 UTC
svn commit: r1541034 - in /incubator/sirona/trunk:
agent/performance/web/pom.xml
agent/performance/web/src/test/resources/arquillian.xml
server/reporting/pom.xml server/reporting/src/test/resources/arquillian.xml
Author: rmannibucau
Date: Tue Nov 12 12:38:22 2013
New Revision: 1541034
URL: http://svn.apache.org/r1541034
Log:
random port for arquillian tests, it is based on using defaults of the container in IDE or configured ones when using a good IDE
Modified:
incubator/sirona/trunk/agent/performance/web/pom.xml
incubator/sirona/trunk/agent/performance/web/src/test/resources/arquillian.xml
incubator/sirona/trunk/server/reporting/pom.xml
incubator/sirona/trunk/server/reporting/src/test/resources/arquillian.xml
Modified: incubator/sirona/trunk/agent/performance/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/web/pom.xml?rev=1541034&r1=1541033&r2=1541034&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/web/pom.xml (original)
+++ incubator/sirona/trunk/agent/performance/web/pom.xml Tue Nov 12 12:38:22 2013
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>sirona-web</artifactId>
- <name>Apache Sirona Incubator :: Agent :: Performance :: Web</name>
+ <name>Apache Sirona Incubator :: Agent :: Performance :: Web</name>
<dependencies>
<dependency>
@@ -96,4 +96,45 @@
</dependency>
</dependencies>
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>reserve-http-port</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>reserve-network-port</goal>
+ </goals>
+ <configuration>
+ <portNames>
+ <portName>tomcat.http</portName>
+ </portNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <arquillian.launch>tomcat7</arquillian.launch>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
Modified: incubator/sirona/trunk/agent/performance/web/src/test/resources/arquillian.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/web/src/test/resources/arquillian.xml?rev=1541034&r1=1541033&r2=1541034&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/web/src/test/resources/arquillian.xml (original)
+++ incubator/sirona/trunk/agent/performance/web/src/test/resources/arquillian.xml Tue Nov 12 12:38:22 2013
@@ -20,12 +20,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
- <container qualifier="tomcat7" default="true">
+ <container qualifier="tomcat7">
<configuration>
<property name="tomcatHome">target/tomcat7</property>
<property name="workDir">target/arquillian-work</property>
<property name="unpackArchive">true</property>
- <property name="bindHttpPort">1234</property>
+ <property name="bindHttpPort">${tomcat.http}</property>
</configuration>
</container>
</arquillian>
Modified: incubator/sirona/trunk/server/reporting/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/pom.xml?rev=1541034&r1=1541033&r2=1541034&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/pom.xml (original)
+++ incubator/sirona/trunk/server/reporting/pom.xml Tue Nov 12 12:38:22 2013
@@ -112,6 +112,12 @@
</dependencies>
<build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
@@ -129,6 +135,37 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>reserve-http-port</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>reserve-network-port</goal>
+ </goals>
+ <configuration>
+ <portNames>
+ <portName>tomcat.http</portName>
+ </portNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <arquillian.launch>tomcat7</arquillian.launch>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
Modified: incubator/sirona/trunk/server/reporting/src/test/resources/arquillian.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/test/resources/arquillian.xml?rev=1541034&r1=1541033&r2=1541034&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/test/resources/arquillian.xml (original)
+++ incubator/sirona/trunk/server/reporting/src/test/resources/arquillian.xml Tue Nov 12 12:38:22 2013
@@ -20,12 +20,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
- <container qualifier="tomcat7" default="true">
+ <container qualifier="tomcat7">
<configuration>
<property name="tomcatHome">target/tomcat7</property>
<property name="workDir">target/arquillian-work</property>
<property name="unpackArchive">true</property>
- <property name="bindHttpPort">1234</property>
+ <property name="bindHttpPort">${tomcat.http}</property>
</configuration>
</container>
</arquillian>