Repository: sqoop Updated Branches: refs/heads/sqoop2 90d304bb0 -> 06e9cdca4
SQOOP-2369: Sqoop2: Use random port for AJP end point in TomcatSqoopMiniCluster (Guoquan Shen via Abraham Elmahrek) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/06e9cdca Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/06e9cdca Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/06e9cdca Branch: refs/heads/sqoop2 Commit: 06e9cdca47262b72f3ccbb575f5a3a8ce7782c61 Parents: 90d304b Author: Abraham Elmahrek <[email protected]> Authored: Fri May 29 18:20:47 2015 -0700 Committer: Abraham Elmahrek <[email protected]> Committed: Fri May 29 18:20:47 2015 -0700 ---------------------------------------------------------------------- .../apache/sqoop/test/minicluster/TomcatSqoopMiniCluster.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/06e9cdca/test/src/main/java/org/apache/sqoop/test/minicluster/TomcatSqoopMiniCluster.java ---------------------------------------------------------------------- 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 5a6773d..5829011 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.deployable.WAR; 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 class TomcatSqoopMiniCluster extends SqoopMiniCluster { // Random port configuration.setProperty(ServletPropertySet.PORT, port.toString()); + configuration.setProperty(TomcatPropertySet.AJP_PORT, ajpPort.toString()); // Start Sqoop server LOG.info("Tomcat extract path: " + extractPath);
