Merge branch '1.4.x' into 1.5.x

Author: wilkinsona

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java

@@ -300,7 +300,8 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
 		@Bean
 		public WelcomePageHandlerMapping welcomePageHandlerMapping(
 				ResourceProperties resourceProperties) {
-			return new WelcomePageHandlerMapping(resourceProperties.getWelcomePage());
+			return new WelcomePageHandlerMapping(resourceProperties.getWelcomePage(),
+					this.mvcProperties.getStaticPathPattern());
 		}
 
 		private void customizeResourceHandlerRegistration(
@@ -520,8 +521,9 @@ static final class WelcomePageHandlerMapping extends AbstractUrlHandlerMapping {
 		private static final Log logger = LogFactory
 				.getLog(WelcomePageHandlerMapping.class);
 
-		private WelcomePageHandlerMapping(Resource welcomePage) {
-			if (welcomePage != null) {
+		private WelcomePageHandlerMapping(Resource welcomePage,
+				String staticPathPattern) {
+			if (welcomePage != null && "/**".equals(staticPathPattern)) {
 				logger.info("Adding welcome page: " + welcomePage);
 				ParameterizableViewController controller = new ParameterizableViewController();
 				controller.setViewName("forward:index.html");

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java

@@ -569,6 +569,15 @@ public void welcomePageMappingProducesNotFoundResponseWhenThereIsNoWelcomePage()
 				.andExpect(status().isNotFound());
 	}
 
+	@Test
+	public void welcomePageRootHandlerIsNotRegisteredWhenStaticPathPatternIsNotSlashStarStar() {
+		load("spring.resources.static-locations:classpath:/welcome-page/",
+				"spring.mvc.static-path-pattern:/foo/**");
+		WelcomePageHandlerMapping welcomePageHandlerMapping = this.context
+				.getBean(WelcomePageHandlerMapping.class);
+		assertThat(welcomePageHandlerMapping.getRootHandler()).isNull();
+	}
+
 	@Test
 	public void welcomePageMappingHandlesRequestsThatAcceptTextHtml() throws Exception {
 		load("spring.resources.static-locations:classpath:/welcome-page/");