From 923f286ae2d51a8ab540d49b3fa844ad36814065 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@gopivotal.com>
Date: Fri, 27 Sep 2013 09:34:10 -0400
Subject: [PATCH] Add spring.view.{prefix,suffix} properties

Fixes #62
---
 .../autoconfigure/web/WebMvcAutoConfiguration.java   | 10 +++++++++-
 .../boot/sample/jsp/SampleWebJspApplication.java     | 12 +-----------
 .../src/main/resources/application.properties        |  2 ++
 3 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 spring-boot-samples/spring-boot-sample-web-jsp/src/main/resources/application.properties

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 3346ebcabbf..da36556f125 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
@@ -28,6 +28,7 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -110,6 +111,12 @@ public class WebMvcAutoConfiguration {
 
 		private static Log logger = LogFactory.getLog(WebMvcConfigurerAdapter.class);
 
+		@Value("${spring.view.prefix:}")
+		private String prefix = "";
+
+		@Value("${spring.view.suffix:}")
+		private String suffix = "";
+
 		@Autowired
 		private ListableBeanFactory beanFactory;
 
@@ -117,10 +124,11 @@ public class WebMvcAutoConfiguration {
 		private ResourceLoader resourceLoader;
 
 		@Bean
-		@ConditionalOnBean(View.class)
 		@ConditionalOnMissingBean(InternalResourceViewResolver.class)
 		public InternalResourceViewResolver defaultViewResolver() {
 			InternalResourceViewResolver resolver = new InternalResourceViewResolver();
+			resolver.setPrefix(this.prefix);
+			resolver.setSuffix(this.suffix);
 			return resolver;
 		}
 
diff --git a/spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/org/springframework/boot/sample/jsp/SampleWebJspApplication.java b/spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/org/springframework/boot/sample/jsp/SampleWebJspApplication.java
index e9c16f0ed37..9e1a124aafa 100644
--- a/spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/org/springframework/boot/sample/jsp/SampleWebJspApplication.java
+++ b/spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/org/springframework/boot/sample/jsp/SampleWebJspApplication.java
@@ -18,24 +18,14 @@ package org.springframework.boot.sample.jsp;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.view.InternalResourceViewResolver;
 
 @Configuration
 @EnableAutoConfiguration
 @ComponentScan
 public class SampleWebJspApplication {
-
-	@Bean
-	public InternalResourceViewResolver defaultViewResolver() {
-		InternalResourceViewResolver resolver = new InternalResourceViewResolver();
-		resolver.setPrefix("/WEB-INF/jsp/");
-		resolver.setSuffix(".jsp");
-		return resolver;
-	}
-
+	
 	public static void main(String[] args) throws Exception {
 		SpringApplication.run(SampleWebJspApplication.class, args);
 	}
diff --git a/spring-boot-samples/spring-boot-sample-web-jsp/src/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-web-jsp/src/main/resources/application.properties
new file mode 100644
index 00000000000..c5afec35ca6
--- /dev/null
+++ b/spring-boot-samples/spring-boot-sample-web-jsp/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+spring.view.prefix: /WEB-INF/jsp/
+spring.view.suffix: .jsp