Merge branch 'master' into feature/multitenant-autz

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/EmbeddedTomcatAutoConfiguration.java

@@ -17,7 +17,9 @@
 
 import javax.servlet.Servlet;
 
+import org.apache.catalina.connector.Connector;
 import org.apache.catalina.startup.Tomcat;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -52,10 +54,27 @@ public class EmbeddedTomcatAutoConfiguration {
 	@ConditionalOnClass({ Servlet.class, Tomcat.class })
 	@ConditionalOnMissingBean(value = TomcatServletWebServerFactory.class, search = SearchStrategy.CURRENT)
 	public static class EmbeddedTomcat {
-
+
+		@Value( "${server.tomcat.ajp.enabled:false}" )
+		private boolean enableAjp;
+
+		@Value( "${server.tomcat.ajp.port:9090}" )
+		private int port;
+
 		@Bean
 		public TomcatServletWebServerFactory tomcatEmbeddedServletContainerFactory() {
-			return new MidPointTomcatServletWebServerFactory();
+			MidPointTomcatServletWebServerFactory tomcat = new MidPointTomcatServletWebServerFactory();
+
+			if(enableAjp) {
+				Connector ajpConnector = new Connector("AJP/1.3");
+				ajpConnector.setPort(port);
+				ajpConnector.setSecure(false);
+				ajpConnector.setScheme("http");
+				ajpConnector.setAllowTrace(false);
+				tomcat.addAdditionalTomcatConnectors(ajpConnector);
+			}
+
+			return tomcat;
 		}
 
 	}

gui/admin-gui/src/main/resources/application.yml

@@ -10,6 +10,10 @@ server:
   tomcat:
     basedir: ${midpoint.home}
     max-http-post-size: 104857600 # in bytes
+## Enable and configuration ajp connector for mp
+#    ajp:
+#      enabled: true
+#      port: 9090
   servlet:
     context-path: /midpoint
     application-display-name: MidPoint
@@ -46,14 +50,4 @@ auth:
 #  enable-csrf: false # default for midpoint is true
 
 # more properties with default values can be found here:
-# https://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html
-
-management:
-  endpoint:
-    health:
-      enabled: true
-
-
-#logging:
-#  level:
-#    org.springframework: TRACE
+# https://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html