Remove '/resources/**' mapping and default servlet

Remove '/resources/**' mapping since it can cause problems with the '/**' when the developer defines their own 'resources' sub-folder. Also remove default servlet config since the resources mapping renders it redundant. Issue: #55494446

Remove '/resources/**' mapping and default servlet
Remove '/resources/**' mapping since it can cause problems with the '/**' when the developer defines their own 'resources' sub-folder. Also remove default servlet config since the resources mapping renders it redundant. Issue: #55494446
859b2663 · Phillip Webb · e55fc944 · 859b2663 · 859b2663 · 859b2663
Commit 859b2663 authored Aug 23, 2013 by Phillip Webb
6 changed files
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java
@@ -48,7 +48,6 @@ import org.springframework.web.accept.ContentNegotiationManager;
 import org.springframework.web.filter.HiddenHttpMethodFilter;
 import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.web.servlet.View;
-import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
@@ -145,12 +144,6 @@ public class WebMvcAutoConfiguration {
 			return resolver;
 		}

-		@Override
-		public void configureDefaultServletHandling(
-				DefaultServletHandlerConfigurer configurer) {
-			configurer.enable();
-		}
-
 		@Override
 		public void addFormatters(FormatterRegistry registry) {
 			for (Converter<?, ?> converter : getBeansOfType(Converter.class)) {
@@ -172,8 +165,6 @@ public class WebMvcAutoConfiguration {

 		@Override
 		public void addResourceHandlers(ResourceHandlerRegistry registry) {
-			registry.addResourceHandler("/resources/**").addResourceLocations(
-					RESOURCE_LOCATIONS);
 			registry.addResourceHandler("/**").addResourceLocations(RESOURCE_LOCATIONS);
 		}


--- a/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/error.html
+++ b/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/error.html
@@ -2,8 +2,8 @@
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
 <title>Error</title>
-<link rel="stylesheet" th:href="@{/resources/css/bootstrap.min.css}"
-	href="../../resources/css/bootstrap.min.css" />
+<link rel="stylesheet" th:href="@{/css/bootstrap.min.css}"
+	href="../../css/bootstrap.min.css" />
 </head>
 <body>
 	<div class="container">

--- a/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/home.html
+++ b/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/home.html
@@ -2,8 +2,8 @@
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
 <title th:text="${title}">Title</title>
-<link rel="stylesheet" th:href="@{/resources/css/bootstrap.min.css}"
-	href="../../resources/css/bootstrap.min.css" />
+<link rel="stylesheet" th:href="@{/css/bootstrap.min.css}"
+	href="../../css/bootstrap.min.css" />
 </head>
 <body>
 	<div class="container">

--- a/spring-boot-samples/spring-boot-sample-web-static/src/test/java/org/springframework/boot/sample/ui/SampleWebStaticApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-web-static/src/test/java/org/springframework/boot/sample/ui/SampleWebStaticApplicationTests.java
@@ -63,7 +63,7 @@ public class SampleWebStaticApplicationTests {
 	@Test
 	public void testCss() throws Exception {
 		ResponseEntity<String> entity = getRestTemplate().getForEntity(
-				"http://localhost:8080/resources/css/bootstrap.min.css", String.class);
+				"http://localhost:8080/css/bootstrap.min.css", String.class);
 		assertEquals(HttpStatus.OK, entity.getStatusCode());
 		assertTrue("Wrong body:\n" + entity.getBody(), entity.getBody().contains("body"));
 		assertEquals("Wrong content type:\n" + entity.getHeaders().getContentType(),

--- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/layout.html
+++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/layout.html
@@ -3,8 +3,8 @@
  <head>
    <title>Layout</title>
    <link rel="stylesheet"
-      th:href="@{/resources/css/bootstrap.min.css}"
-      href="../../resources/css/bootstrap.min.css"/>
+      th:href="@{/css/bootstrap.min.css}"
+      href="../../css/bootstrap.min.css"/>
  </head>
  <body>
    <div class="container">

--- a/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/SampleWebUiApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/SampleWebUiApplicationTests.java
@@ -78,7 +78,7 @@ public class SampleWebUiApplicationTests {
 	@Test
 	public void testCss() throws Exception {
 		ResponseEntity<String> entity = getRestTemplate().getForEntity(
-				"http://localhost:8080/resources/css/bootstrap.min.css", String.class);
+				"http://localhost:8080/css/bootstrap.min.css", String.class);
 		assertEquals(HttpStatus.OK, entity.getStatusCode());
 		assertTrue("Wrong body:\n" + entity.getBody(), entity.getBody().contains("body"));
 	}