diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml
index d77c6f55b9..7c8b54d111 100644
--- a/spring-boot-samples/pom.xml
+++ b/spring-boot-samples/pom.xml
@@ -68,6 +68,7 @@
spring-boot-sample-undertow
spring-boot-sample-undertow-ssl
spring-boot-sample-velocity
+ spring-boot-sample-war
spring-boot-sample-web-freemarker
spring-boot-sample-web-groovy-templates
spring-boot-sample-web-method-security
diff --git a/spring-boot-samples/spring-boot-sample-war/pom.xml b/spring-boot-samples/spring-boot-sample-war/pom.xml
new file mode 100644
index 0000000000..959bf51486
--- /dev/null
+++ b/spring-boot-samples/spring-boot-sample-war/pom.xml
@@ -0,0 +1,86 @@
+
+
+ 4.0.0
+
+
+ org.springframework.boot
+ spring-boot-samples
+ 1.2.7.BUILD-SNAPSHOT
+
+ spring-boot-sample-war
+ war
+ Spring Boot War Sample
+ Spring Boot War Sample
+ http://projects.spring.io/spring-boot/
+
+ Pivotal Software, Inc.
+ http://www.spring.io
+
+
+ ${basedir}/../..
+ /
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter
+
+
+ javax.servlet
+ javax.servlet-api
+ provided
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+ org.springframework.boot
+ spring-boot-starter-tomcat
+
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+
+
+ tomcat
+
+
+ org.springframework.boot
+ spring-boot-starter-tomcat
+ provided
+
+
+
+
+ jetty
+
+
+ org.springframework.boot
+ spring-boot-starter-jetty
+ provided
+
+
+
+
+ undertow
+
+
+ org.springframework.boot
+ spring-boot-starter-undertow
+ provided
+
+
+
+
+
diff --git a/spring-boot-samples/spring-boot-sample-war/src/main/java/sample/war/MyController.java b/spring-boot-samples/spring-boot-sample-war/src/main/java/sample/war/MyController.java
new file mode 100644
index 0000000000..fc4732ca35
--- /dev/null
+++ b/spring-boot-samples/spring-boot-sample-war/src/main/java/sample/war/MyController.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2012-2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.war;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class MyController {
+
+ @RequestMapping("/")
+ public String hello() {
+ return "Hello World!";
+ }
+
+}
diff --git a/spring-boot-samples/spring-boot-sample-war/src/main/java/sample/war/SampleWarApplication.java b/spring-boot-samples/spring-boot-sample-war/src/main/java/sample/war/SampleWarApplication.java
new file mode 100644
index 0000000000..6336f74d45
--- /dev/null
+++ b/spring-boot-samples/spring-boot-sample-war/src/main/java/sample/war/SampleWarApplication.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2012-2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.war;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.web.SpringBootServletInitializer;
+
+/**
+ * Sample WAR application
+ */
+@SpringBootApplication
+public class SampleWarApplication extends SpringBootServletInitializer {
+
+ public static void main(String[] args) {
+ SpringApplication.run(SampleWarApplication.class, args);
+ }
+
+}
diff --git a/spring-boot-samples/spring-boot-sample-war/src/main/webapp/webapp.txt b/spring-boot-samples/spring-boot-sample-war/src/main/webapp/webapp.txt
new file mode 100644
index 0000000000..8df12e9d87
--- /dev/null
+++ b/spring-boot-samples/spring-boot-sample-war/src/main/webapp/webapp.txt
@@ -0,0 +1 @@
+Hello WebApp