GitHub-Spring
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

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
pull/50/head
Phillip Webb 12 years ago
parent
e294e67d12
commit
a95494fe61
6 changed files with 13 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java
  2. 6
      spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/error.html
  3. 6
      spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/home.html
  4. 4
      spring-boot-samples/spring-boot-sample-web-static/src/test/java/org/springframework/boot/sample/ui/SampleWebStaticApplicationTests.java
  5. 6
      spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/layout.html
  6. 4
      spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/SampleWebUiApplicationTests.java

9
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java
Unescape View File

@ -48,7 +48,6 @@ import org.springframework.web.accept.ContentNegotiationManager; @@ -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 { @@ -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 { @@ -172,8 +165,6 @@ public class WebMvcAutoConfiguration {
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
registry.addResourceHandler("/resources/**").addResourceLocations(
RESOURCE_LOCATIONS);
registry.addResourceHandler("/**").addResourceLocations(RESOURCE_LOCATIONS);
}

6
spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/error.html
Unescape View File

@ -2,8 +2,8 @@ @@ -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">
@ -28,4 +28,4 @@ @@ -28,4 +28,4 @@
</div>
</div>
</body>
</html>
</html>

6
spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/home.html
Unescape View File

@ -2,8 +2,8 @@ @@ -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">
@ -22,4 +22,4 @@ @@ -22,4 +22,4 @@
2012 2:17:16 PM CDT</div>
</div>
</body>
</html>
</html>

4
spring-boot-samples/spring-boot-sample-web-static/src/test/java/org/springframework/boot/sample/ui/SampleWebStaticApplicationTests.java
Unescape View File

@ -23,7 +23,7 @@ import static org.junit.Assert.assertTrue; @@ -23,7 +23,7 @@ import static org.junit.Assert.assertTrue;
/**
* Basic integration tests for demo application.
*
*
* @author Dave Syer
*/
public class SampleWebStaticApplicationTests {
@ -63,7 +63,7 @@ public class SampleWebStaticApplicationTests { @@ -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(),

6
spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/layout.html
Unescape View File

@ -3,8 +3,8 @@ @@ -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">
@ -29,4 +29,4 @@ @@ -29,4 +29,4 @@
</div>
</div>
</body>
</html>
</html>

4
spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/SampleWebUiApplicationTests.java
Unescape View File

@ -26,7 +26,7 @@ import static org.junit.Assert.assertTrue; @@ -26,7 +26,7 @@ import static org.junit.Assert.assertTrue;
/**
* Basic integration tests for demo application.
*
*
* @author Dave Syer
*/
public class SampleWebUiApplicationTests {
@ -78,7 +78,7 @@ public class SampleWebUiApplicationTests { @@ -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"));
}

Write Preview
Loading…
Cancel
Save