From 36c3ceab97beeee5601b6061db904537f442a9a1 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 29 Jul 2013 13:03:42 -0700 Subject: [PATCH] Include servlet support for index.html resources Issue: #54228642 --- .../boot/autoconfigure/web/WebMvcAutoConfiguration.java | 5 ++--- .../boot/sample/ui/SampleWebStaticApplicationTests.java | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git 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 index ce2aec4cae..7da87faebe 100644 --- 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 @@ -88,10 +88,9 @@ public class WebMvcAutoConfiguration { private static final String[] STATIC_INDEX_HTML_RESOURCES; static { - STATIC_INDEX_HTML_RESOURCES = new String[CLASSPATH_RESOURCE_LOCATIONS.length]; + STATIC_INDEX_HTML_RESOURCES = new String[RESOURCE_LOCATIONS.length]; for (int i = 0; i < STATIC_INDEX_HTML_RESOURCES.length; i++) { - STATIC_INDEX_HTML_RESOURCES[i] = CLASSPATH_RESOURCE_LOCATIONS[i] - + "index.html"; + STATIC_INDEX_HTML_RESOURCES[i] = RESOURCE_LOCATIONS[i] + "index.html"; } } diff --git 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 index 1dc8198d5f..1e0d332919 100644 --- 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 @@ -8,7 +8,6 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import org.springframework.boot.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; @@ -27,8 +26,6 @@ import static org.junit.Assert.assertTrue; * * @author Dave Syer */ -@Ignore -// FIXME See #54228642 public class SampleWebStaticApplicationTests { private static ConfigurableApplicationContext context;