From d9e326a3d3ea1b5eabce2fffcc62764ccbb41248 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@gopivotal.com>
Date: Thu, 19 Dec 2013 08:28:06 +0000
Subject: [PATCH] Add @Value injection to JSP (WAR) sample

---
 .../springframework/boot/sample/jsp/WelcomeController.java   | 5 +++++
 .../src/main/resources/application.properties                | 1 +
 .../src/main/webapp/WEB-INF/jsp/welcome.jsp                  | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/org/springframework/boot/sample/jsp/WelcomeController.java b/spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/org/springframework/boot/sample/jsp/WelcomeController.java
index 5cda29db81..88c1ea1bda 100644
--- a/spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/org/springframework/boot/sample/jsp/WelcomeController.java
+++ b/spring-boot-samples/spring-boot-sample-web-jsp/src/main/java/org/springframework/boot/sample/jsp/WelcomeController.java
@@ -3,15 +3,20 @@ package org.springframework.boot.sample.jsp;
 import java.util.Date;
 import java.util.Map;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 @Controller
 public class WelcomeController {
 
+	@Value("${application.message:Hello World}")
+	private String message = "Hello World";
+
 	@RequestMapping("/")
 	public String welcome(Map<String,Object> model) {
 		model.put("time", new Date());
+		model.put("message", message );
 		return "welcome";
 	}
 
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
index c5afec35ca..f95f1d3c01 100644
--- 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
@@ -1,2 +1,3 @@
 spring.view.prefix: /WEB-INF/jsp/
 spring.view.suffix: .jsp
+application.message: Hello Phil
\ No newline at end of file
diff --git a/spring-boot-samples/spring-boot-sample-web-jsp/src/main/webapp/WEB-INF/jsp/welcome.jsp b/spring-boot-samples/spring-boot-sample-web-jsp/src/main/webapp/WEB-INF/jsp/welcome.jsp
index 53402dc8a3..3196dac625 100644
--- a/spring-boot-samples/spring-boot-sample-web-jsp/src/main/webapp/WEB-INF/jsp/welcome.jsp
+++ b/spring-boot-samples/spring-boot-sample-web-jsp/src/main/webapp/WEB-INF/jsp/welcome.jsp
@@ -11,6 +11,8 @@
 	Spring URL: ${springUrl} at ${time}
 	<br>
 	JSTL URL: ${url}
+	<br>
+	Message: ${message}
 </body>
 
 </html>