From 52fd5dde58d5a60f9c42c4e899c9526e41299999 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Sat, 6 Dec 2014 00:35:18 -0800
Subject: [PATCH] Update cargo configuration to also set AJP ports

Fixes gh-1736
---
 spring-boot-dependencies/pom.xml                                | 2 +-
 .../spring-boot-deployment-test-tomcat/pom.xml                  | 2 ++
 .../spring-boot-deployment-test-tomee/pom.xml                   | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 514d77efa1..96bb142e02 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -1569,4 +1569,4 @@
 			<id>integration-test</id>
 		</profile>
 	</profiles>
-</project>
+</project>
\ No newline at end of file
diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml b/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml
index 6ed51d4520..4a521d1d65 100644
--- a/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml
+++ b/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml
@@ -51,6 +51,7 @@
 						<configuration>
 							<portNames>
 								<portName>appserver.port</portName>
+								<portName>appserver.ajp.port</portName>
 							</portNames>
 						</configuration>
 					</execution>
@@ -70,6 +71,7 @@
 					<configuration>
 						<properties>
 							<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
+							<cargo.tomcat.ajp.port>${appserver.ajp.port}</cargo.tomcat.ajp.port>
 						</properties>
 					</configuration>
 					<deployables>
diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml b/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml
index 9561eeb871..c204f514c3 100644
--- a/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml
+++ b/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml
@@ -56,6 +56,7 @@
 						<configuration>
 							<portNames>
 								<portName>appserver.port</portName>
+								<portName>appserver.ajp.port</portName>
 							</portNames>
 						</configuration>
 					</execution>
@@ -75,6 +76,7 @@
 					<configuration>
 						<properties>
 							<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
+							<cargo.tomcat.ajp.port>${appserver.ajp.port}</cargo.tomcat.ajp.port>
 						</properties>
 					</configuration>
 					<deployables>