From 06e9cdca47262b72f3ccbb575f5a3a8ce7782c61 Mon Sep 17 00:00:00 2001
From: Abraham Elmahrek <abe@apache.org>
Date: Fri, 29 May 2015 18:20:47 -0700
Subject: [PATCH] SQOOP-2369: Sqoop2: Use random port for AJP end point in
 TomcatSqoopMiniCluster

(Guoquan Shen via Abraham Elmahrek)
---
 .../sqoop/test/minicluster/TomcatSqoopMiniCluster.java       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/src/main/java/org/apache/sqoop/test/minicluster/TomcatSqoopMiniCluster.java b/test/src/main/java/org/apache/sqoop/test/minicluster/TomcatSqoopMiniCluster.java
index 5a6773dc..58290119 100644
--- a/test/src/main/java/org/apache/sqoop/test/minicluster/TomcatSqoopMiniCluster.java
+++ b/test/src/main/java/org/apache/sqoop/test/minicluster/TomcatSqoopMiniCluster.java
@@ -34,6 +34,7 @@
 import org.codehaus.cargo.container.installer.Installer;
 import org.codehaus.cargo.container.installer.ZipURLInstaller;
 import org.codehaus.cargo.container.property.ServletPropertySet;
+import org.codehaus.cargo.container.tomcat.TomcatPropertySet;
 import org.codehaus.cargo.generic.DefaultContainerFactory;
 import org.codehaus.cargo.generic.configuration.DefaultConfigurationFactory;
 
@@ -46,6 +47,7 @@ public class TomcatSqoopMiniCluster extends SqoopMiniCluster {
 
   private InstalledLocalContainer container = null;
   private Integer port;
+  private Integer ajpPort;
 
   private static final Logger LOG = Logger.getLogger(TomcatSqoopMiniCluster.class);
 
@@ -53,12 +55,14 @@ public class TomcatSqoopMiniCluster extends SqoopMiniCluster {
   public TomcatSqoopMiniCluster(String temporaryPath) throws Exception {
     super(temporaryPath);
     port = NetworkUtils.findAvailablePort();
+    ajpPort = NetworkUtils.findAvailablePort();
   }
 
   /** {@inheritDoc} */
   public TomcatSqoopMiniCluster(String temporaryPath, Configuration configuration) throws Exception {
     super(temporaryPath, configuration);
     port = NetworkUtils.findAvailablePort();
+    ajpPort = NetworkUtils.findAvailablePort();
   }
 
   /** {@inheritDoc} */
@@ -136,6 +140,7 @@ public void start() throws Exception {
 
     // Random port
     configuration.setProperty(ServletPropertySet.PORT, port.toString());
+    configuration.setProperty(TomcatPropertySet.AJP_PORT, ajpPort.toString());
 
     // Start Sqoop server
     LOG.info("Tomcat extract path: " + extractPath);