From 90885c2bfa51c97a2fa8515541400393fd85bf99 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Fri, 4 May 2012 13:09:55 +0000
Subject: use dynamic port allocation of tomcat maven plugin

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1333933 13f79535-47bb-0310-9956-ffa450edef68
---
 archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml')

diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
index 1a36d93a3..cc81ea119 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
@@ -31,6 +31,8 @@
 
   <properties>
     <webappDirectory>${project.build.directory}/tomcat7x/webapps/archiva</webappDirectory>
+    <container.test.port>0</container.test.port>
+    <tomcat.propertiesPortFilePath>${project.build.directory}/tomcat-port.properties</tomcat.propertiesPortFilePath>
   </properties>
 
   <dependencies>
@@ -201,6 +203,7 @@
                 <maxWaitTimeInMs>${maxWaitTimeInMs}</maxWaitTimeInMs>
                 <seleniumHost>${seleniumHost}</seleniumHost>
                 <seleniumPort>${seleniumPort}</seleniumPort>
+                <tomcat.propertiesPortFilePath>${tomcat.propertiesPortFilePath}</tomcat.propertiesPortFilePath>
               </systemPropertyVariables>
             </configuration>
           </execution>
@@ -279,7 +282,7 @@
                   </tasks>
                 </configuration>
               </execution>
-              <execution>
+              <!--execution>
                 <id>check-archiva-loaded</id>
                 <phase>integration-test</phase>
                 <configuration>
@@ -291,7 +294,7 @@
                 <goals>
                   <goal>run</goal>
                 </goals>
-              </execution>
+              </execution-->
             </executions>
           </plugin>
           <plugin>
@@ -330,6 +333,7 @@
                     <archiva.devMode>true</archiva.devMode>
                   </systemProperties>
                   <contextFile>${project.build.testOutputDirectory}/archiva.xml</contextFile>
+                  <propertiesPortFilePath>${tomcat.propertiesPortFilePath}</propertiesPortFilePath>
                   <useNaming>true</useNaming>
                 </configuration>
               </execution>
-- 
cgit v1.2.3