svn commit: r1778968 - in /jackrabbit/oak/trunk/oak-examples/webapp: pom.xml src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java

[chetanm]

Author: chetanm
Date: Mon Jan 16 06:49:05 2017
New Revision: 1778968

URL: http://svn.apache.org/viewvc?rev=1778968&view=rev
Log:
OAK-5418 - Test failure: TomcatIT.testTomcat()

Use random port for starting Tomcat to avoid conflicts in CI setups

Modified:
    jackrabbit/oak/trunk/oak-examples/webapp/pom.xml
    
jackrabbit/oak/trunk/oak-examples/webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java

Modified: jackrabbit/oak/trunk/oak-examples/webapp/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/webapp/pom.xml?rev=1778968&r1=1778967&r2=1778968&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-examples/webapp/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-examples/webapp/pom.xml Mon Jan 16 06:49:05 2017
@@ -249,6 +249,18 @@
                 </artifacts>
             </configuration>
           </execution>
+          <execution>
+            <id>reserve-network-port</id>
+            <goals>
+              <goal>reserve-network-port</goal>
+            </goals>
+            <phase>process-resources</phase>
+            <configuration>
+              <portNames>
+                <portName>tomcat.http.port</portName>
+              </portNames>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -281,6 +293,7 @@
             <java.util.logging.config.file>
               src/test/resources/logging.properties
             </java.util.logging.config.file>
+            <tomcat.http.port>${tomcat.http.port}</tomcat.http.port>
           </systemPropertyVariables>
         </configuration>
         <executions>

Modified: 
jackrabbit/oak/trunk/oak-examples/webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java?rev=1778968&r1=1778967&r2=1778968&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-examples/webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-examples/webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
 Mon Jan 16 06:49:05 2017
@@ -70,7 +70,7 @@ public class TomcatIT extends TestCase {
         File repoDir = new File("target", "repository");
         FileUtils.deleteQuietly(repoDir);
 
-        url = new URL("http://localhost:12856/";);
+        url = new URL("http://localhost:"+getPort()+"/");
 
         tomcat = new Tomcat();
         tomcat.setSilent(true);
@@ -129,4 +129,8 @@ public class TomcatIT extends TestCase {
         tomcat.stop();
     }
 
+    private static int getPort() {
+        return Integer.getInteger("tomcat.http.port", 12856);
+    }
+
 }