diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml
index e5e51659e2..b77a27ef09 100644
--- a/spring-boot-samples/pom.xml
+++ b/spring-boot-samples/pom.xml
@@ -73,8 +73,8 @@
 		<module>spring-boot-sample-web-jsp</module>
 		<module>spring-boot-sample-web-ui</module>
 		<module>spring-boot-sample-web-velocity</module>
-		<module>spring-boot-sample-websocket</module>
 		<module>spring-boot-sample-websocket-jetty</module>
+		<module>spring-boot-sample-websocket-tomcat</module>
 		<module>spring-boot-sample-websocket-undertow</module>
 		<module>spring-boot-sample-ws</module>
 		<module>spring-boot-sample-xml</module>
diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/config/SampleWebSocketsApplication.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/SampleJettyWebSocketsApplication.java
similarity index 85%
rename from spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/config/SampleWebSocketsApplication.java
rename to spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/SampleJettyWebSocketsApplication.java
index 963ea166e3..b347d96e31 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/config/SampleWebSocketsApplication.java
+++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/SampleJettyWebSocketsApplication.java
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package samples.websocket.config;
+package samples.websocket;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.context.web.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.web.socket.WebSocketHandler;
 import org.springframework.web.socket.config.annotation.EnableWebSocket;
 import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
@@ -36,10 +37,11 @@ import samples.websocket.echo.EchoWebSocketHandler;
 import samples.websocket.reverse.ReverseWebSocketEndpoint;
 import samples.websocket.snake.SnakeWebSocketHandler;
 
-@SpringBootApplication
+@Configuration
+@EnableAutoConfiguration
 @EnableWebSocket
-public class SampleWebSocketsApplication extends SpringBootServletInitializer implements
-		WebSocketConfigurer {
+public class SampleJettyWebSocketsApplication extends SpringBootServletInitializer
+		implements WebSocketConfigurer {
 
 	@Override
 	public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
@@ -49,11 +51,7 @@ public class SampleWebSocketsApplication extends SpringBootServletInitializer im
 
 	@Override
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-		return application.sources(SampleWebSocketsApplication.class);
-	}
-
-	public static void main(String[] args) {
-		SpringApplication.run(SampleWebSocketsApplication.class, args);
+		return application.sources(SampleJettyWebSocketsApplication.class);
 	}
 
 	@Bean
@@ -86,4 +84,8 @@ public class SampleWebSocketsApplication extends SpringBootServletInitializer im
 		return new ServerEndpointExporter();
 	}
 
+	public static void main(String[] args) {
+		SpringApplication.run(SampleJettyWebSocketsApplication.class, args);
+	}
+
 }
diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/resources/static/echo.html b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/resources/static/echo.html
index 0ffca05b4d..9a0a7650bf 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/resources/static/echo.html
+++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/resources/static/echo.html
@@ -1,133 +1,134 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You 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
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You 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
+	  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.
+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.
 -->
+
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Apache Tomcat WebSocket Examples: Echo</title>
-    <style type="text/css">
-        #connect-container {
-            float: left;
-            width: 400px
-        }
+	<title>Apache Tomcat WebSocket Examples: Echo</title>
+	<style type="text/css">
+		#connect-container {
+			float: left;
+			width: 400px
+		}
 
-        #connect-container div {
-            padding: 5px;
-        }
+		#connect-container div {
+			padding: 5px;
+		}
 
-        #console-container {
-            float: left;
-            margin-left: 15px;
-            width: 400px;
-        }
+		#console-container {
+			float: left;
+			margin-left: 15px;
+			width: 400px;
+		}
 
-        #console {
-            border: 1px solid #CCCCCC;
-            border-right-color: #999999;
-            border-bottom-color: #999999;
-            height: 170px;
-            overflow-y: scroll;
-            padding: 5px;
-            width: 100%;
-        }
+		#console {
+			border: 1px solid #CCCCCC;
+			border-right-color: #999999;
+			border-bottom-color: #999999;
+			height: 170px;
+			overflow-y: scroll;
+			padding: 5px;
+			width: 100%;
+		}
 
-        #console p {
-            padding: 0;
-            margin: 0;
-        }
-    </style>
-    <script src="https://cdn.jsdelivr.net/sockjs/0.3.4/sockjs.min.js"></script>
-    <script type="text/javascript">
-        var ws = null;
+		#console p {
+			padding: 0;
+			margin: 0;
+		}
+	</style>
+	<script src="https://cdn.jsdelivr.net/sockjs/0.3.4/sockjs.min.js"></script>
+	<script type="text/javascript">
+		var ws = null;
 
-        function setConnected(connected) {
-            document.getElementById('connect').disabled = connected;
-            document.getElementById('disconnect').disabled = !connected;
-            document.getElementById('echo').disabled = !connected;
-        }
+		function setConnected(connected) {
+			document.getElementById('connect').disabled = connected;
+			document.getElementById('disconnect').disabled = !connected;
+			document.getElementById('echo').disabled = !connected;
+		}
 
-        function connect() {
-            var target = document.getElementById('target').value;
-            ws = new SockJS(target);
-            ws.onopen = function () {
-                setConnected(true);
-                log('Info: WebSocket connection opened.');
-            };
-            ws.onmessage = function (event) {
-                log('Received: ' + event.data);
-            };
-            ws.onclose = function () {
-                setConnected(false);
-                log('Info: WebSocket connection closed.');
-            };
-        }
+		function connect() {
+			var target = document.getElementById('target').value;
+			ws = new SockJS(target);
+			ws.onopen = function () {
+				setConnected(true);
+				log('Info: WebSocket connection opened.');
+			};
+			ws.onmessage = function (event) {
+				log('Received: ' + event.data);
+			};
+			ws.onclose = function () {
+				setConnected(false);
+				log('Info: WebSocket connection closed.');
+			};
+		}
 
-        function disconnect() {
-            if (ws != null) {
-                ws.close();
-                ws = null;
-            }
-            setConnected(false);
-        }
+		function disconnect() {
+			if (ws != null) {
+				ws.close();
+				ws = null;
+			}
+			setConnected(false);
+		}
 
-        function echo() {
-            if (ws != null) {
-                var message = document.getElementById('message').value;
-                log('Sent: ' + message);
-                ws.send(message);
-            } else {
-                alert('WebSocket connection not established, please connect.');
-            }
-        }
+		function echo() {
+			if (ws != null) {
+				var message = document.getElementById('message').value;
+				log('Sent: ' + message);
+				ws.send(message);
+			} else {
+				alert('WebSocket connection not established, please connect.');
+			}
+		}
 
-        function log(message) {
-            var console = document.getElementById('console');
-            var p = document.createElement('p');
-            p.style.wordWrap = 'break-word';
-            p.appendChild(document.createTextNode(message));
-            console.appendChild(p);
-            while (console.childNodes.length > 25) {
-                console.removeChild(console.firstChild);
-            }
-            console.scrollTop = console.scrollHeight;
-        }
-    </script>
+		function log(message) {
+			var console = document.getElementById('console');
+			var p = document.createElement('p');
+			p.style.wordWrap = 'break-word';
+			p.appendChild(document.createTextNode(message));
+			console.appendChild(p);
+			while (console.childNodes.length > 25) {
+				console.removeChild(console.firstChild);
+			}
+			console.scrollTop = console.scrollHeight;
+		}
+	</script>
 </head>
 <body>
 <noscript><h2 style="color: #ff0000">Seems your browser doesn't support Javascript! Websockets rely on Javascript being enabled. Please enable
-    Javascript and reload this page!</h2></noscript>
+	Javascript and reload this page!</h2></noscript>
 <div>
-    <div id="connect-container">
-        <div>
-            <input id="target" type="text" size="40" style="width: 350px" value="/echo"/>
-        </div>
-        <div>
-            <button id="connect" onclick="connect();">Connect</button>
-            <button id="disconnect" disabled="disabled" onclick="disconnect();">Disconnect</button>
-        </div>
-        <div>
-            <textarea id="message" style="width: 350px">Here is a message!</textarea>
-        </div>
-        <div>
-            <button id="echo" onclick="echo();" disabled="disabled">Echo message</button>
-        </div>
-    </div>
-    <div id="console-container">
-        <div id="console"></div>
-    </div>
+	<div id="connect-container">
+		<div>
+			<input id="target" type="text" size="40" style="width: 350px" value="/echo"/>
+		</div>
+		<div>
+			<button id="connect" onclick="connect();">Connect</button>
+			<button id="disconnect" disabled="disabled" onclick="disconnect();">Disconnect</button>
+		</div>
+		<div>
+			<textarea id="message" style="width: 350px">Here is a message!</textarea>
+		</div>
+		<div>
+			<button id="echo" onclick="echo();" disabled="disabled">Echo message</button>
+		</div>
+	</div>
+	<div id="console-container">
+		<div id="console"></div>
+	</div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/resources/static/index.html b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/resources/static/index.html
index e2b76b6e44..e9585067a3 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/resources/static/index.html
+++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/resources/static/index.html
@@ -1,32 +1,33 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You 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
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You 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
+	  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.
+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.
 -->
+
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Apache Tomcat WebSocket Examples: Index</title>
+	<title>Apache Tomcat WebSocket Examples: Index</title>
 </head>
 <body>
 <noscript><h2 style="color: #ff0000">Seems your browser doesn't support Javascript! Websockets rely on Javascript being enabled. Please enable
-    Javascript and reload this page!</h2></noscript>
+	Javascript and reload this page!</h2></noscript>
 <p>Please select the sample you would like to try.</p>
 <ul>
-    <li><a href="./echo.html">Echo</a></li>
-    <li><a href="./reverse.html">Reverse</a></li>
-    <li><a href="./snake.html">Snake</a></li>
+	<li><a href="./echo.html">Echo</a></li>
+	<li><a href="./reverse.html">Reverse</a></li>
+	<li><a href="./snake.html">Snake</a></li>
 </ul>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/resources/static/reverse.html b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/resources/static/reverse.html
index 96aaf25de7..be2c043930 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/resources/static/reverse.html
+++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/resources/static/reverse.html
@@ -1,140 +1,141 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You 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
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You 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
+	  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.
+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.
 -->
+
 <!DOCTYPE html>
 <html>
 <head>
-    <title>WebSocket Examples: Reverse</title>
-    <style type="text/css">
-        #connect-container {
-            float: left;
-            width: 400px
-        }
+	<title>WebSocket Examples: Reverse</title>
+	<style type="text/css">
+		#connect-container {
+			float: left;
+			width: 400px
+		}
 
-        #connect-container div {
-            padding: 5px;
-        }
+		#connect-container div {
+			padding: 5px;
+		}
 
-        #console-container {
-            float: left;
-            margin-left: 15px;
-            width: 400px;
-        }
+		#console-container {
+			float: left;
+			margin-left: 15px;
+			width: 400px;
+		}
 
-        #console {
-            border: 1px solid #CCCCCC;
-            border-right-color: #999999;
-            border-bottom-color: #999999;
-            height: 170px;
-            overflow-y: scroll;
-            padding: 5px;
-            width: 100%;
-        }
+		#console {
+			border: 1px solid #CCCCCC;
+			border-right-color: #999999;
+			border-bottom-color: #999999;
+			height: 170px;
+			overflow-y: scroll;
+			padding: 5px;
+			width: 100%;
+		}
 
-        #console p {
-            padding: 0;
-            margin: 0;
-        }
-    </style>
-    <script type="text/javascript">
-        var ws = null;
+		#console p {
+			padding: 0;
+			margin: 0;
+		}
+	</style>
+	<script type="text/javascript">
+		var ws = null;
 
-        function setConnected(connected) {
-            document.getElementById('connect').disabled = connected;
-            document.getElementById('disconnect').disabled = !connected;
-            document.getElementById('reverse').disabled = !connected;
-        }
+		function setConnected(connected) {
+			document.getElementById('connect').disabled = connected;
+			document.getElementById('disconnect').disabled = !connected;
+			document.getElementById('reverse').disabled = !connected;
+		}
 
-        function connect() {
-            var target = document.getElementById('target').value;
-            ws = new WebSocket(target);
-            ws.onopen = function () {
-                setConnected(true);
-                log('Info: WebSocket connection opened.');
-            };
-            ws.onmessage = function (event) {
-                log('Received: ' + event.data);
-            };
-            ws.onclose = function () {
-                setConnected(false);
-                log('Info: WebSocket connection closed.');
-            };
-        }
+		function connect() {
+			var target = document.getElementById('target').value;
+			ws = new WebSocket(target);
+			ws.onopen = function () {
+				setConnected(true);
+				log('Info: WebSocket connection opened.');
+			};
+			ws.onmessage = function (event) {
+				log('Received: ' + event.data);
+			};
+			ws.onclose = function () {
+				setConnected(false);
+				log('Info: WebSocket connection closed.');
+			};
+		}
 
-        function updateTarget() {
-            if (window.location.protocol == 'http:') {
-                document.getElementById('target').value = 'ws://' + window.location.host + document.getElementById('target').value;
-            } else {
-                document.getElementById('target').value = 'wss://' + window.location.host + document.getElementById('target').value;
-            }
-        }
+		function updateTarget() {
+			if (window.location.protocol == 'http:') {
+				document.getElementById('target').value = 'ws://' + window.location.host + document.getElementById('target').value;
+			} else {
+				document.getElementById('target').value = 'wss://' + window.location.host + document.getElementById('target').value;
+			}
+		}
 
-        function disconnect() {
-            if (ws != null) {
-                ws.close();
-                ws = null;
-            }
-            setConnected(false);
-        }
+		function disconnect() {
+			if (ws != null) {
+				ws.close();
+				ws = null;
+			}
+			setConnected(false);
+		}
 
-        function reverse() {
-            if (ws != null) {
-                var message = document.getElementById('message').value;
-                log('Sent: ' + message);
-                ws.send(message);
-            } else {
-                alert('WebSocket connection not established, please connect.');
-            }
-        }
+		function reverse() {
+			if (ws != null) {
+				var message = document.getElementById('message').value;
+				log('Sent: ' + message);
+				ws.send(message);
+			} else {
+				alert('WebSocket connection not established, please connect.');
+			}
+		}
 
-        function log(message) {
-            var console = document.getElementById('console');
-            var p = document.createElement('p');
-            p.style.wordWrap = 'break-word';
-            p.appendChild(document.createTextNode(message));
-            console.appendChild(p);
-            while (console.childNodes.length > 25) {
-                console.removeChild(console.firstChild);
-            }
-            console.scrollTop = console.scrollHeight;
-        }
-    </script>
+		function log(message) {
+			var console = document.getElementById('console');
+			var p = document.createElement('p');
+			p.style.wordWrap = 'break-word';
+			p.appendChild(document.createTextNode(message));
+			console.appendChild(p);
+			while (console.childNodes.length > 25) {
+				console.removeChild(console.firstChild);
+			}
+			console.scrollTop = console.scrollHeight;
+		}
+	</script>
 </head>
 <body onload="updateTarget()">
 <noscript><h2 style="color: #ff0000">Seems your browser doesn't support Javascript! Websockets rely on Javascript being enabled. Please enable
-    Javascript and reload this page!</h2></noscript>
+	Javascript and reload this page!</h2></noscript>
 <div>
-    <div id="connect-container">
-        <div>
-            <input id="target" type="text" size="40" style="width: 350px" value="/reverse"/>
-        </div>
-        <div>
-            <button id="connect" onclick="connect();">Connect</button>
-            <button id="disconnect" disabled="disabled" onclick="disconnect();">Disconnect</button>
-        </div>
-        <div>
-            <textarea id="message" style="width: 350px">Here is a message!</textarea>
-        </div>
-        <div>
-            <button id="reverse" onclick="reverse();" disabled="disabled">Reverse message</button>
-        </div>
-    </div>
-    <div id="console-container">
-        <div id="console"></div>
-    </div>
+	<div id="connect-container">
+		<div>
+			<input id="target" type="text" size="40" style="width: 350px" value="/reverse"/>
+		</div>
+		<div>
+			<button id="connect" onclick="connect();">Connect</button>
+			<button id="disconnect" disabled="disabled" onclick="disconnect();">Disconnect</button>
+		</div>
+		<div>
+			<textarea id="message" style="width: 350px">Here is a message!</textarea>
+		</div>
+		<div>
+			<button id="reverse" onclick="reverse();" disabled="disabled">Reverse message</button>
+		</div>
+	</div>
+	<div id="console-container">
+		<div id="console"></div>
+	</div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/resources/static/snake.html b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/resources/static/snake.html
index 5728fc0144..d305381069 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/resources/static/snake.html
+++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/resources/static/snake.html
@@ -1,249 +1,250 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You 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
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You 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
+	  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.
+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.
 -->
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+		"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title>Apache Tomcat WebSocket Examples: Multiplayer Snake</title>
-    <style type="text/css">
-        #playground {
-            width: 640px;
-            height: 480px;
-            background-color: #000;
-        }
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+	<title>Apache Tomcat WebSocket Examples: Multiplayer Snake</title>
+	<style type="text/css">
+		#playground {
+			width: 640px;
+			height: 480px;
+			background-color: #000;
+		}
 
-        #console-container {
-            float: left;
-            margin-left: 15px;
-            width: 300px;
-        }
+		#console-container {
+			float: left;
+			margin-left: 15px;
+			width: 300px;
+		}
 
-        #console {
-            border: 1px solid #CCCCCC;
-            border-right-color: #999999;
-            border-bottom-color: #999999;
-            height: 480px;
-            overflow-y: scroll;
-            padding-left: 5px;
-            padding-right: 5px;
-            width: 100%;
-        }
+		#console {
+			border: 1px solid #CCCCCC;
+			border-right-color: #999999;
+			border-bottom-color: #999999;
+			height: 480px;
+			overflow-y: scroll;
+			padding-left: 5px;
+			padding-right: 5px;
+			width: 100%;
+		}
 
-        #console p {
-            padding: 0;
-            margin: 0;
-        }
-    </style>
-    <script src="https://cdn.jsdelivr.net/sockjs/0.3.4/sockjs.min.js"></script>
+		#console p {
+			padding: 0;
+			margin: 0;
+		}
+	</style>
+	<script src="https://cdn.jsdelivr.net/sockjs/0.3.4/sockjs.min.js"></script>
 </head>
 <body>
-    <noscript><h2 style="color: #ff0000">Seems your browser doesn't support Javascript! Websockets rely on Javascript being enabled. Please enable
-    Javascript and reload this page!</h2></noscript>
+	<noscript><h2 style="color: #ff0000">Seems your browser doesn't support Javascript! Websockets rely on Javascript being enabled. Please enable
+	Javascript and reload this page!</h2></noscript>
 
-    <div style="float: left">
-        <canvas id="playground" width="640" height="480"></canvas>
-    </div>
-    <div id="console-container">
-        <div id="console"></div>
-    </div>
-    <script type="text/javascript">
+	<div style="float: left">
+		<canvas id="playground" width="640" height="480"></canvas>
+	</div>
+	<div id="console-container">
+		<div id="console"></div>
+	</div>
+	<script type="text/javascript">
 
-        var Game = {};
+		var Game = {};
 
-        Game.fps = 30;
-        Game.socket = null;
-        Game.nextFrame = null;
-        Game.interval = null;
-        Game.direction = 'none';
-        Game.gridSize = 10;
+		Game.fps = 30;
+		Game.socket = null;
+		Game.nextFrame = null;
+		Game.interval = null;
+		Game.direction = 'none';
+		Game.gridSize = 10;
 
-        function Snake() {
-            this.snakeBody = [];
-            this.color = null;
-        }
+		function Snake() {
+			this.snakeBody = [];
+			this.color = null;
+		}
 
-        Snake.prototype.draw = function(context) {
-            for (var id in this.snakeBody) {
-                context.fillStyle = this.color;
-                context.fillRect(this.snakeBody[id].x, this.snakeBody[id].y, Game.gridSize, Game.gridSize);
-            }
-        };
+		Snake.prototype.draw = function(context) {
+			for (var id in this.snakeBody) {
+				context.fillStyle = this.color;
+				context.fillRect(this.snakeBody[id].x, this.snakeBody[id].y, Game.gridSize, Game.gridSize);
+			}
+		};
 
-        Game.initialize = function() {
-            this.entities = [];
-            canvas = document.getElementById('playground');
-            if (!canvas.getContext) {
-                Console.log('Error: 2d canvas not supported by this browser.');
-                return;
-            }
-            this.context = canvas.getContext('2d');
-            window.addEventListener('keydown', function (e) {
-                var code = e.keyCode;
-                if (code > 36 && code < 41) {
-                    switch (code) {
-                        case 37:
-                            if (Game.direction != 'east') Game.setDirection('west');
-                            break;
-                        case 38:
-                            if (Game.direction != 'south') Game.setDirection('north');
-                            break;
-                        case 39:
-                            if (Game.direction != 'west') Game.setDirection('east');
-                            break;
-                        case 40:
-                            if (Game.direction != 'north') Game.setDirection('south');
-                            break;
-                    }
-                }
-            }, false);
-            Game.connect();
-        };
+		Game.initialize = function() {
+			this.entities = [];
+			canvas = document.getElementById('playground');
+			if (!canvas.getContext) {
+				Console.log('Error: 2d canvas not supported by this browser.');
+				return;
+			}
+			this.context = canvas.getContext('2d');
+			window.addEventListener('keydown', function (e) {
+				var code = e.keyCode;
+				if (code > 36 && code < 41) {
+					switch (code) {
+						case 37:
+							if (Game.direction != 'east') Game.setDirection('west');
+							break;
+						case 38:
+							if (Game.direction != 'south') Game.setDirection('north');
+							break;
+						case 39:
+							if (Game.direction != 'west') Game.setDirection('east');
+							break;
+						case 40:
+							if (Game.direction != 'north') Game.setDirection('south');
+							break;
+					}
+				}
+			}, false);
+			Game.connect();
+		};
 
-        Game.setDirection  = function(direction) {
-            Game.direction = direction;
-            Game.socket.send(direction);
-            Console.log('Sent: Direction ' + direction);
-        };
+		Game.setDirection  = function(direction) {
+			Game.direction = direction;
+			Game.socket.send(direction);
+			Console.log('Sent: Direction ' + direction);
+		};
 
-        Game.startGameLoop = function() {
-            if (window.webkitRequestAnimationFrame) {
-                Game.nextFrame = function () {
-                    webkitRequestAnimationFrame(Game.run);
-                };
-            } else if (window.mozRequestAnimationFrame) {
-                Game.nextFrame = function () {
-                    mozRequestAnimationFrame(Game.run);
-                };
-            } else {
-                Game.interval = setInterval(Game.run, 1000 / Game.fps);
-            }
-            if (Game.nextFrame != null) {
-                Game.nextFrame();
-            }
-        };
+		Game.startGameLoop = function() {
+			if (window.webkitRequestAnimationFrame) {
+				Game.nextFrame = function () {
+					webkitRequestAnimationFrame(Game.run);
+				};
+			} else if (window.mozRequestAnimationFrame) {
+				Game.nextFrame = function () {
+					mozRequestAnimationFrame(Game.run);
+				};
+			} else {
+				Game.interval = setInterval(Game.run, 1000 / Game.fps);
+			}
+			if (Game.nextFrame != null) {
+				Game.nextFrame();
+			}
+		};
 
-        Game.stopGameLoop = function () {
-            Game.nextFrame = null;
-            if (Game.interval != null) {
-                clearInterval(Game.interval);
-            }
-        };
+		Game.stopGameLoop = function () {
+			Game.nextFrame = null;
+			if (Game.interval != null) {
+				clearInterval(Game.interval);
+			}
+		};
 
-        Game.draw = function() {
-            this.context.clearRect(0, 0, 640, 480);
-            for (var id in this.entities) {
-                this.entities[id].draw(this.context);
-            }
-        };
+		Game.draw = function() {
+			this.context.clearRect(0, 0, 640, 480);
+			for (var id in this.entities) {
+				this.entities[id].draw(this.context);
+			}
+		};
 
-        Game.addSnake = function(id, color) {
-            Game.entities[id] = new Snake();
-            Game.entities[id].color = color;
-        };
+		Game.addSnake = function(id, color) {
+			Game.entities[id] = new Snake();
+			Game.entities[id].color = color;
+		};
 
-        Game.updateSnake = function(id, snakeBody) {
-            if (typeof Game.entities[id] != "undefined") {
-                Game.entities[id].snakeBody = snakeBody;
-            }
-        };
+		Game.updateSnake = function(id, snakeBody) {
+			if (typeof Game.entities[id] != "undefined") {
+				Game.entities[id].snakeBody = snakeBody;
+			}
+		};
 
-        Game.removeSnake = function(id) {
-            Game.entities[id] = null;
-            // Force GC.
-            delete Game.entities[id];
-        };
+		Game.removeSnake = function(id) {
+			Game.entities[id] = null;
+			// Force GC.
+			delete Game.entities[id];
+		};
 
-        Game.run = (function() {
-            var skipTicks = 1000 / Game.fps, nextGameTick = (new Date).getTime();
+		Game.run = (function() {
+			var skipTicks = 1000 / Game.fps, nextGameTick = (new Date).getTime();
 
-            return function() {
-                while ((new Date).getTime() > nextGameTick) {
-                    nextGameTick += skipTicks;
-                }
-                Game.draw();
-                if (Game.nextFrame != null) {
-                    Game.nextFrame();
-                }
-            };
-        })();
+			return function() {
+				while ((new Date).getTime() > nextGameTick) {
+					nextGameTick += skipTicks;
+				}
+				Game.draw();
+				if (Game.nextFrame != null) {
+					Game.nextFrame();
+				}
+			};
+		})();
 
-        Game.connect = (function() {
-        	Game.socket = new SockJS("/snake");
+		Game.connect = (function() {
+			Game.socket = new SockJS("/snake");
 
-            Game.socket.onopen = function () {
-                // Socket open.. start the game loop.
-                Console.log('Info: WebSocket connection opened.');
-                Console.log('Info: Press an arrow key to begin.');
-                Game.startGameLoop();
-                setInterval(function() {
-                    // Prevent server read timeout.
-                    Game.socket.send('ping');
-                }, 5000);
-            };
+			Game.socket.onopen = function () {
+				// Socket open.. start the game loop.
+				Console.log('Info: WebSocket connection opened.');
+				Console.log('Info: Press an arrow key to begin.');
+				Game.startGameLoop();
+				setInterval(function() {
+					// Prevent server read timeout.
+					Game.socket.send('ping');
+				}, 5000);
+			};
 
-            Game.socket.onclose = function () {
-                Console.log('Info: WebSocket closed.');
-                Game.stopGameLoop();
-            };
+			Game.socket.onclose = function () {
+				Console.log('Info: WebSocket closed.');
+				Game.stopGameLoop();
+			};
 
-            Game.socket.onmessage = function (message) {
-                // _Potential_ security hole, consider using json lib to parse data in production.
-                var packet = eval('(' + message.data + ')');
-                switch (packet.type) {
-                    case 'update':
-                        for (var i = 0; i < packet.data.length; i++) {
-                            Game.updateSnake(packet.data[i].id, packet.data[i].body);
-                        }
-                        break;
-                    case 'join':
-                        for (var j = 0; j < packet.data.length; j++) {
-                            Game.addSnake(packet.data[j].id, packet.data[j].color);
-                        }
-                        break;
-                    case 'leave':
-                        Game.removeSnake(packet.id);
-                        break;
-                    case 'dead':
-                        Console.log('Info: Your snake is dead, bad luck!');
-                        Game.direction = 'none';
-                        break;
-                    case 'kill':
-                        Console.log('Info: Head shot!');
-                        break;
-                }
-            };
-        });
+			Game.socket.onmessage = function (message) {
+				// _Potential_ security hole, consider using json lib to parse data in production.
+				var packet = eval('(' + message.data + ')');
+				switch (packet.type) {
+					case 'update':
+						for (var i = 0; i < packet.data.length; i++) {
+							Game.updateSnake(packet.data[i].id, packet.data[i].body);
+						}
+						break;
+					case 'join':
+						for (var j = 0; j < packet.data.length; j++) {
+							Game.addSnake(packet.data[j].id, packet.data[j].color);
+						}
+						break;
+					case 'leave':
+						Game.removeSnake(packet.id);
+						break;
+					case 'dead':
+						Console.log('Info: Your snake is dead, bad luck!');
+						Game.direction = 'none';
+						break;
+					case 'kill':
+						Console.log('Info: Head shot!');
+						break;
+				}
+			};
+		});
 
-        var Console = {};
+		var Console = {};
 
-        Console.log = (function(message) {
-            var console = document.getElementById('console');
-            var p = document.createElement('p');
-            p.style.wordWrap = 'break-word';
-            p.innerHTML = message;
-            console.appendChild(p);
-            while (console.childNodes.length > 25) {
-                console.removeChild(console.firstChild);
-            }
-            console.scrollTop = console.scrollHeight;
-        });
+		Console.log = (function(message) {
+			var console = document.getElementById('console');
+			var p = document.createElement('p');
+			p.style.wordWrap = 'break-word';
+			p.innerHTML = message;
+			console.appendChild(p);
+			while (console.childNodes.length > 25) {
+				console.removeChild(console.firstChild);
+			}
+			console.scrollTop = console.scrollHeight;
+		});
 
-        Game.initialize();
-    </script>
+		Game.initialize();
+	</script>
 </body>
 </html>
diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/SampleWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/SampleWebSocketsApplicationTests.java
index cff0db5490..c12b3109f8 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/SampleWebSocketsApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/SampleWebSocketsApplicationTests.java
@@ -42,12 +42,11 @@ import org.springframework.web.socket.client.standard.StandardWebSocketClient;
 import samples.websocket.client.GreetingService;
 import samples.websocket.client.SimpleClientWebSocketHandler;
 import samples.websocket.client.SimpleGreetingService;
-import samples.websocket.config.SampleWebSocketsApplication;
 
 import static org.junit.Assert.assertEquals;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = SampleWebSocketsApplication.class)
+@SpringApplicationConfiguration(classes = SampleJettyWebSocketsApplication.class)
 @WebAppConfiguration
 @IntegrationTest("server.port:0")
 @DirtiesContext
diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/echo/CustomContainerWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/echo/CustomContainerWebSocketsApplicationTests.java
index bcc020e646..0a204fbc7f 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/echo/CustomContainerWebSocketsApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/echo/CustomContainerWebSocketsApplicationTests.java
@@ -42,16 +42,16 @@ import org.springframework.util.SocketUtils;
 import org.springframework.web.socket.client.WebSocketConnectionManager;
 import org.springframework.web.socket.client.standard.StandardWebSocketClient;
 
+import samples.websocket.SampleJettyWebSocketsApplication;
 import samples.websocket.client.GreetingService;
 import samples.websocket.client.SimpleClientWebSocketHandler;
 import samples.websocket.client.SimpleGreetingService;
-import samples.websocket.config.SampleWebSocketsApplication;
 import samples.websocket.echo.CustomContainerWebSocketsApplicationTests.CustomContainerConfiguration;
 
 import static org.junit.Assert.assertEquals;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = { SampleWebSocketsApplication.class,
+@SpringApplicationConfiguration(classes = { SampleJettyWebSocketsApplication.class,
 		CustomContainerConfiguration.class })
 @WebAppConfiguration
 @IntegrationTest
@@ -63,14 +63,6 @@ public class CustomContainerWebSocketsApplicationTests {
 
 	private static int PORT = SocketUtils.findAvailableTcpPort();
 
-	@Configuration
-	protected static class CustomContainerConfiguration {
-		@Bean
-		public EmbeddedServletContainerFactory embeddedServletContainerFactory() {
-			return new JettyEmbeddedServletContainerFactory("/ws", PORT);
-		}
-	}
-
 	@Test
 	public void echoEndpoint() throws Exception {
 		ConfigurableApplicationContext context = new SpringApplicationBuilder(
@@ -99,6 +91,16 @@ public class CustomContainerWebSocketsApplicationTests {
 		assertEquals("Reversed: !dlrow olleH", messagePayloadReference.get());
 	}
 
+	@Configuration
+	protected static class CustomContainerConfiguration {
+
+		@Bean
+		public EmbeddedServletContainerFactory embeddedServletContainerFactory() {
+			return new JettyEmbeddedServletContainerFactory("/ws", PORT);
+		}
+
+	}
+
 	@Configuration
 	static class ClientConfiguration implements CommandLineRunner {
 
@@ -145,6 +147,7 @@ public class CustomContainerWebSocketsApplicationTests {
 		public GreetingService greetingService() {
 			return new SimpleGreetingService();
 		}
+
 	}
 
 }
diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/snake/SnakeTimerTests.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/snake/SnakeTimerTests.java
index 9a8305e46b..298afbd807 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/snake/SnakeTimerTests.java
+++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/snake/SnakeTimerTests.java
@@ -37,4 +37,5 @@ public class SnakeTimerTests {
 		SnakeTimer.broadcast("");
 		assertThat(SnakeTimer.getSnakes().size(), is(0));
 	}
+
 }
diff --git a/spring-boot-samples/spring-boot-sample-websocket/pom.xml b/spring-boot-samples/spring-boot-sample-websocket-tomcat/pom.xml
similarity index 88%
rename from spring-boot-samples/spring-boot-sample-websocket/pom.xml
rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/pom.xml
index 450765bde4..3ddf75026f 100755
--- a/spring-boot-samples/spring-boot-sample-websocket/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/pom.xml
@@ -7,9 +7,9 @@
 		<artifactId>spring-boot-samples</artifactId>
 		<version>1.2.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-sample-websocket</artifactId>
-	<name>Spring Boot WebSocket Sample</name>
-	<description>Spring Boot WebSocket Sample</description>
+	<artifactId>spring-boot-sample-websocket-tomcat</artifactId>
+	<name>Spring Boot WebSocket Tomcat Sample</name>
+	<description>Spring Boot WebSocket Tomcat Sample</description>
 	<url>http://projects.spring.io/spring-boot/</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/config/SampleWebSocketsApplication.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/SampleTomcatWebSocketApplication.java
similarity index 85%
rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/config/SampleWebSocketsApplication.java
rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/SampleTomcatWebSocketApplication.java
index 2ae2ddfb56..b0d48a9f12 100644
--- a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/config/SampleWebSocketsApplication.java
+++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/SampleTomcatWebSocketApplication.java
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package samples.websocket.config;
+package samples.websocket;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.context.web.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.web.socket.WebSocketHandler;
 import org.springframework.web.socket.config.annotation.EnableWebSocket;
 import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
@@ -36,10 +37,11 @@ import samples.websocket.echo.EchoWebSocketHandler;
 import samples.websocket.reverse.ReverseWebSocketEndpoint;
 import samples.websocket.snake.SnakeWebSocketHandler;
 
-@SpringBootApplication
+@Configuration
+@EnableAutoConfiguration
 @EnableWebSocket
-public class SampleWebSocketsApplication extends SpringBootServletInitializer implements
-		WebSocketConfigurer {
+public class SampleTomcatWebSocketApplication extends SpringBootServletInitializer
+		implements WebSocketConfigurer {
 
 	@Override
 	public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
@@ -49,11 +51,7 @@ public class SampleWebSocketsApplication extends SpringBootServletInitializer im
 
 	@Override
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-		return application.sources(SampleWebSocketsApplication.class);
-	}
-
-	public static void main(String[] args) {
-		SpringApplication.run(SampleWebSocketsApplication.class, args);
+		return application.sources(SampleTomcatWebSocketApplication.class);
 	}
 
 	@Bean
@@ -86,4 +84,8 @@ public class SampleWebSocketsApplication extends SpringBootServletInitializer im
 		return new ServerEndpointExporter();
 	}
 
+	public static void main(String[] args) {
+		SpringApplication.run(SampleTomcatWebSocketApplication.class, args);
+	}
+
 }
diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/client/GreetingService.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/client/GreetingService.java
similarity index 100%
rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/client/GreetingService.java
rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/client/GreetingService.java
diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/client/SimpleClientWebSocketHandler.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/client/SimpleClientWebSocketHandler.java
similarity index 100%
rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/client/SimpleClientWebSocketHandler.java
rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/client/SimpleClientWebSocketHandler.java
diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/client/SimpleGreetingService.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/client/SimpleGreetingService.java
similarity index 100%
rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/client/SimpleGreetingService.java
rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/client/SimpleGreetingService.java
diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/echo/DefaultEchoService.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/echo/DefaultEchoService.java
similarity index 100%
rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/echo/DefaultEchoService.java
rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/echo/DefaultEchoService.java
diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/echo/EchoService.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/echo/EchoService.java
similarity index 100%
rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/echo/EchoService.java
rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/echo/EchoService.java
diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/echo/EchoWebSocketHandler.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/echo/EchoWebSocketHandler.java
similarity index 100%
rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/echo/EchoWebSocketHandler.java
rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/echo/EchoWebSocketHandler.java
diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/reverse/ReverseWebSocketEndpoint.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/reverse/ReverseWebSocketEndpoint.java
similarity index 100%
rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/reverse/ReverseWebSocketEndpoint.java
rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/reverse/ReverseWebSocketEndpoint.java
diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/Direction.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/Direction.java
similarity index 100%
rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/Direction.java
rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/Direction.java
diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/Location.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/Location.java
similarity index 100%
rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/Location.java
rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/Location.java
diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/Snake.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/Snake.java
similarity index 100%
rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/Snake.java
rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/Snake.java
diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/SnakeTimer.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/SnakeTimer.java
similarity index 100%
rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/SnakeTimer.java
rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/SnakeTimer.java
diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/SnakeUtils.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/SnakeUtils.java
similarity index 100%
rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/SnakeUtils.java
rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/SnakeUtils.java
diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/SnakeWebSocketHandler.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/SnakeWebSocketHandler.java
similarity index 100%
rename from spring-boot-samples/spring-boot-sample-websocket/src/main/java/samples/websocket/snake/SnakeWebSocketHandler.java
rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/snake/SnakeWebSocketHandler.java
diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/resources/static/echo.html b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/resources/static/echo.html
new file mode 100644
index 0000000000..9a0a7650bf
--- /dev/null
+++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/resources/static/echo.html
@@ -0,0 +1,134 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You 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.
+-->
+
+<!DOCTYPE html>
+<html>
+<head>
+	<title>Apache Tomcat WebSocket Examples: Echo</title>
+	<style type="text/css">
+		#connect-container {
+			float: left;
+			width: 400px
+		}
+
+		#connect-container div {
+			padding: 5px;
+		}
+
+		#console-container {
+			float: left;
+			margin-left: 15px;
+			width: 400px;
+		}
+
+		#console {
+			border: 1px solid #CCCCCC;
+			border-right-color: #999999;
+			border-bottom-color: #999999;
+			height: 170px;
+			overflow-y: scroll;
+			padding: 5px;
+			width: 100%;
+		}
+
+		#console p {
+			padding: 0;
+			margin: 0;
+		}
+	</style>
+	<script src="https://cdn.jsdelivr.net/sockjs/0.3.4/sockjs.min.js"></script>
+	<script type="text/javascript">
+		var ws = null;
+
+		function setConnected(connected) {
+			document.getElementById('connect').disabled = connected;
+			document.getElementById('disconnect').disabled = !connected;
+			document.getElementById('echo').disabled = !connected;
+		}
+
+		function connect() {
+			var target = document.getElementById('target').value;
+			ws = new SockJS(target);
+			ws.onopen = function () {
+				setConnected(true);
+				log('Info: WebSocket connection opened.');
+			};
+			ws.onmessage = function (event) {
+				log('Received: ' + event.data);
+			};
+			ws.onclose = function () {
+				setConnected(false);
+				log('Info: WebSocket connection closed.');
+			};
+		}
+
+		function disconnect() {
+			if (ws != null) {
+				ws.close();
+				ws = null;
+			}
+			setConnected(false);
+		}
+
+		function echo() {
+			if (ws != null) {
+				var message = document.getElementById('message').value;
+				log('Sent: ' + message);
+				ws.send(message);
+			} else {
+				alert('WebSocket connection not established, please connect.');
+			}
+		}
+
+		function log(message) {
+			var console = document.getElementById('console');
+			var p = document.createElement('p');
+			p.style.wordWrap = 'break-word';
+			p.appendChild(document.createTextNode(message));
+			console.appendChild(p);
+			while (console.childNodes.length > 25) {
+				console.removeChild(console.firstChild);
+			}
+			console.scrollTop = console.scrollHeight;
+		}
+	</script>
+</head>
+<body>
+<noscript><h2 style="color: #ff0000">Seems your browser doesn't support Javascript! Websockets rely on Javascript being enabled. Please enable
+	Javascript and reload this page!</h2></noscript>
+<div>
+	<div id="connect-container">
+		<div>
+			<input id="target" type="text" size="40" style="width: 350px" value="/echo"/>
+		</div>
+		<div>
+			<button id="connect" onclick="connect();">Connect</button>
+			<button id="disconnect" disabled="disabled" onclick="disconnect();">Disconnect</button>
+		</div>
+		<div>
+			<textarea id="message" style="width: 350px">Here is a message!</textarea>
+		</div>
+		<div>
+			<button id="echo" onclick="echo();" disabled="disabled">Echo message</button>
+		</div>
+	</div>
+	<div id="console-container">
+		<div id="console"></div>
+	</div>
+</div>
+</body>
+</html>
diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/resources/static/index.html b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/resources/static/index.html
new file mode 100644
index 0000000000..e9585067a3
--- /dev/null
+++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/resources/static/index.html
@@ -0,0 +1,33 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You 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.
+-->
+
+<!DOCTYPE html>
+<html>
+<head>
+	<title>Apache Tomcat WebSocket Examples: Index</title>
+</head>
+<body>
+<noscript><h2 style="color: #ff0000">Seems your browser doesn't support Javascript! Websockets rely on Javascript being enabled. Please enable
+	Javascript and reload this page!</h2></noscript>
+<p>Please select the sample you would like to try.</p>
+<ul>
+	<li><a href="./echo.html">Echo</a></li>
+	<li><a href="./reverse.html">Reverse</a></li>
+	<li><a href="./snake.html">Snake</a></li>
+</ul>
+</body>
+</html>
diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/resources/static/reverse.html b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/resources/static/reverse.html
new file mode 100644
index 0000000000..be2c043930
--- /dev/null
+++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/resources/static/reverse.html
@@ -0,0 +1,141 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You 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.
+-->
+
+<!DOCTYPE html>
+<html>
+<head>
+	<title>WebSocket Examples: Reverse</title>
+	<style type="text/css">
+		#connect-container {
+			float: left;
+			width: 400px
+		}
+
+		#connect-container div {
+			padding: 5px;
+		}
+
+		#console-container {
+			float: left;
+			margin-left: 15px;
+			width: 400px;
+		}
+
+		#console {
+			border: 1px solid #CCCCCC;
+			border-right-color: #999999;
+			border-bottom-color: #999999;
+			height: 170px;
+			overflow-y: scroll;
+			padding: 5px;
+			width: 100%;
+		}
+
+		#console p {
+			padding: 0;
+			margin: 0;
+		}
+	</style>
+	<script type="text/javascript">
+		var ws = null;
+
+		function setConnected(connected) {
+			document.getElementById('connect').disabled = connected;
+			document.getElementById('disconnect').disabled = !connected;
+			document.getElementById('reverse').disabled = !connected;
+		}
+
+		function connect() {
+			var target = document.getElementById('target').value;
+			ws = new WebSocket(target);
+			ws.onopen = function () {
+				setConnected(true);
+				log('Info: WebSocket connection opened.');
+			};
+			ws.onmessage = function (event) {
+				log('Received: ' + event.data);
+			};
+			ws.onclose = function () {
+				setConnected(false);
+				log('Info: WebSocket connection closed.');
+			};
+		}
+
+		function updateTarget() {
+			if (window.location.protocol == 'http:') {
+				document.getElementById('target').value = 'ws://' + window.location.host + document.getElementById('target').value;
+			} else {
+				document.getElementById('target').value = 'wss://' + window.location.host + document.getElementById('target').value;
+			}
+		}
+
+		function disconnect() {
+			if (ws != null) {
+				ws.close();
+				ws = null;
+			}
+			setConnected(false);
+		}
+
+		function reverse() {
+			if (ws != null) {
+				var message = document.getElementById('message').value;
+				log('Sent: ' + message);
+				ws.send(message);
+			} else {
+				alert('WebSocket connection not established, please connect.');
+			}
+		}
+
+		function log(message) {
+			var console = document.getElementById('console');
+			var p = document.createElement('p');
+			p.style.wordWrap = 'break-word';
+			p.appendChild(document.createTextNode(message));
+			console.appendChild(p);
+			while (console.childNodes.length > 25) {
+				console.removeChild(console.firstChild);
+			}
+			console.scrollTop = console.scrollHeight;
+		}
+	</script>
+</head>
+<body onload="updateTarget()">
+<noscript><h2 style="color: #ff0000">Seems your browser doesn't support Javascript! Websockets rely on Javascript being enabled. Please enable
+	Javascript and reload this page!</h2></noscript>
+<div>
+	<div id="connect-container">
+		<div>
+			<input id="target" type="text" size="40" style="width: 350px" value="/reverse"/>
+		</div>
+		<div>
+			<button id="connect" onclick="connect();">Connect</button>
+			<button id="disconnect" disabled="disabled" onclick="disconnect();">Disconnect</button>
+		</div>
+		<div>
+			<textarea id="message" style="width: 350px">Here is a message!</textarea>
+		</div>
+		<div>
+			<button id="reverse" onclick="reverse();" disabled="disabled">Reverse message</button>
+		</div>
+	</div>
+	<div id="console-container">
+		<div id="console"></div>
+	</div>
+</div>
+</body>
+</html>
diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/resources/static/snake.html b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/resources/static/snake.html
new file mode 100644
index 0000000000..d305381069
--- /dev/null
+++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/resources/static/snake.html
@@ -0,0 +1,250 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You 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.
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+		"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+	<title>Apache Tomcat WebSocket Examples: Multiplayer Snake</title>
+	<style type="text/css">
+		#playground {
+			width: 640px;
+			height: 480px;
+			background-color: #000;
+		}
+
+		#console-container {
+			float: left;
+			margin-left: 15px;
+			width: 300px;
+		}
+
+		#console {
+			border: 1px solid #CCCCCC;
+			border-right-color: #999999;
+			border-bottom-color: #999999;
+			height: 480px;
+			overflow-y: scroll;
+			padding-left: 5px;
+			padding-right: 5px;
+			width: 100%;
+		}
+
+		#console p {
+			padding: 0;
+			margin: 0;
+		}
+	</style>
+	<script src="https://cdn.jsdelivr.net/sockjs/0.3.4/sockjs.min.js"></script>
+</head>
+<body>
+	<noscript><h2 style="color: #ff0000">Seems your browser doesn't support Javascript! Websockets rely on Javascript being enabled. Please enable
+	Javascript and reload this page!</h2></noscript>
+
+	<div style="float: left">
+		<canvas id="playground" width="640" height="480"></canvas>
+	</div>
+	<div id="console-container">
+		<div id="console"></div>
+	</div>
+	<script type="text/javascript">
+
+		var Game = {};
+
+		Game.fps = 30;
+		Game.socket = null;
+		Game.nextFrame = null;
+		Game.interval = null;
+		Game.direction = 'none';
+		Game.gridSize = 10;
+
+		function Snake() {
+			this.snakeBody = [];
+			this.color = null;
+		}
+
+		Snake.prototype.draw = function(context) {
+			for (var id in this.snakeBody) {
+				context.fillStyle = this.color;
+				context.fillRect(this.snakeBody[id].x, this.snakeBody[id].y, Game.gridSize, Game.gridSize);
+			}
+		};
+
+		Game.initialize = function() {
+			this.entities = [];
+			canvas = document.getElementById('playground');
+			if (!canvas.getContext) {
+				Console.log('Error: 2d canvas not supported by this browser.');
+				return;
+			}
+			this.context = canvas.getContext('2d');
+			window.addEventListener('keydown', function (e) {
+				var code = e.keyCode;
+				if (code > 36 && code < 41) {
+					switch (code) {
+						case 37:
+							if (Game.direction != 'east') Game.setDirection('west');
+							break;
+						case 38:
+							if (Game.direction != 'south') Game.setDirection('north');
+							break;
+						case 39:
+							if (Game.direction != 'west') Game.setDirection('east');
+							break;
+						case 40:
+							if (Game.direction != 'north') Game.setDirection('south');
+							break;
+					}
+				}
+			}, false);
+			Game.connect();
+		};
+
+		Game.setDirection  = function(direction) {
+			Game.direction = direction;
+			Game.socket.send(direction);
+			Console.log('Sent: Direction ' + direction);
+		};
+
+		Game.startGameLoop = function() {
+			if (window.webkitRequestAnimationFrame) {
+				Game.nextFrame = function () {
+					webkitRequestAnimationFrame(Game.run);
+				};
+			} else if (window.mozRequestAnimationFrame) {
+				Game.nextFrame = function () {
+					mozRequestAnimationFrame(Game.run);
+				};
+			} else {
+				Game.interval = setInterval(Game.run, 1000 / Game.fps);
+			}
+			if (Game.nextFrame != null) {
+				Game.nextFrame();
+			}
+		};
+
+		Game.stopGameLoop = function () {
+			Game.nextFrame = null;
+			if (Game.interval != null) {
+				clearInterval(Game.interval);
+			}
+		};
+
+		Game.draw = function() {
+			this.context.clearRect(0, 0, 640, 480);
+			for (var id in this.entities) {
+				this.entities[id].draw(this.context);
+			}
+		};
+
+		Game.addSnake = function(id, color) {
+			Game.entities[id] = new Snake();
+			Game.entities[id].color = color;
+		};
+
+		Game.updateSnake = function(id, snakeBody) {
+			if (typeof Game.entities[id] != "undefined") {
+				Game.entities[id].snakeBody = snakeBody;
+			}
+		};
+
+		Game.removeSnake = function(id) {
+			Game.entities[id] = null;
+			// Force GC.
+			delete Game.entities[id];
+		};
+
+		Game.run = (function() {
+			var skipTicks = 1000 / Game.fps, nextGameTick = (new Date).getTime();
+
+			return function() {
+				while ((new Date).getTime() > nextGameTick) {
+					nextGameTick += skipTicks;
+				}
+				Game.draw();
+				if (Game.nextFrame != null) {
+					Game.nextFrame();
+				}
+			};
+		})();
+
+		Game.connect = (function() {
+			Game.socket = new SockJS("/snake");
+
+			Game.socket.onopen = function () {
+				// Socket open.. start the game loop.
+				Console.log('Info: WebSocket connection opened.');
+				Console.log('Info: Press an arrow key to begin.');
+				Game.startGameLoop();
+				setInterval(function() {
+					// Prevent server read timeout.
+					Game.socket.send('ping');
+				}, 5000);
+			};
+
+			Game.socket.onclose = function () {
+				Console.log('Info: WebSocket closed.');
+				Game.stopGameLoop();
+			};
+
+			Game.socket.onmessage = function (message) {
+				// _Potential_ security hole, consider using json lib to parse data in production.
+				var packet = eval('(' + message.data + ')');
+				switch (packet.type) {
+					case 'update':
+						for (var i = 0; i < packet.data.length; i++) {
+							Game.updateSnake(packet.data[i].id, packet.data[i].body);
+						}
+						break;
+					case 'join':
+						for (var j = 0; j < packet.data.length; j++) {
+							Game.addSnake(packet.data[j].id, packet.data[j].color);
+						}
+						break;
+					case 'leave':
+						Game.removeSnake(packet.id);
+						break;
+					case 'dead':
+						Console.log('Info: Your snake is dead, bad luck!');
+						Game.direction = 'none';
+						break;
+					case 'kill':
+						Console.log('Info: Head shot!');
+						break;
+				}
+			};
+		});
+
+		var Console = {};
+
+		Console.log = (function(message) {
+			var console = document.getElementById('console');
+			var p = document.createElement('p');
+			p.style.wordWrap = 'break-word';
+			p.innerHTML = message;
+			console.appendChild(p);
+			while (console.childNodes.length > 25) {
+				console.removeChild(console.firstChild);
+			}
+			console.scrollTop = console.scrollHeight;
+		});
+
+		Game.initialize();
+	</script>
+</body>
+</html>
diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/test/java/samples/websocket/SampleWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/SampleWebSocketsApplicationTests.java
similarity index 97%
rename from spring-boot-samples/spring-boot-sample-websocket/src/test/java/samples/websocket/SampleWebSocketsApplicationTests.java
rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/SampleWebSocketsApplicationTests.java
index cff0db5490..bd25281692 100644
--- a/spring-boot-samples/spring-boot-sample-websocket/src/test/java/samples/websocket/SampleWebSocketsApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/SampleWebSocketsApplicationTests.java
@@ -42,12 +42,11 @@ import org.springframework.web.socket.client.standard.StandardWebSocketClient;
 import samples.websocket.client.GreetingService;
 import samples.websocket.client.SimpleClientWebSocketHandler;
 import samples.websocket.client.SimpleGreetingService;
-import samples.websocket.config.SampleWebSocketsApplication;
 
 import static org.junit.Assert.assertEquals;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = SampleWebSocketsApplication.class)
+@SpringApplicationConfiguration(classes = SampleTomcatWebSocketApplication.class)
 @WebAppConfiguration
 @IntegrationTest("server.port:0")
 @DirtiesContext
@@ -133,6 +132,7 @@ public class SampleWebSocketsApplicationTests {
 		public GreetingService greetingService() {
 			return new SimpleGreetingService();
 		}
+
 	}
 
 }
diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/test/java/samples/websocket/echo/CustomContainerWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/echo/CustomContainerWebSocketsApplicationTests.java
similarity index 97%
rename from spring-boot-samples/spring-boot-sample-websocket/src/test/java/samples/websocket/echo/CustomContainerWebSocketsApplicationTests.java
rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/echo/CustomContainerWebSocketsApplicationTests.java
index 1df5822890..1844e4142f 100644
--- a/spring-boot-samples/spring-boot-sample-websocket/src/test/java/samples/websocket/echo/CustomContainerWebSocketsApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/echo/CustomContainerWebSocketsApplicationTests.java
@@ -42,16 +42,16 @@ import org.springframework.util.SocketUtils;
 import org.springframework.web.socket.client.WebSocketConnectionManager;
 import org.springframework.web.socket.client.standard.StandardWebSocketClient;
 
+import samples.websocket.SampleTomcatWebSocketApplication;
 import samples.websocket.client.GreetingService;
 import samples.websocket.client.SimpleClientWebSocketHandler;
 import samples.websocket.client.SimpleGreetingService;
-import samples.websocket.config.SampleWebSocketsApplication;
 import samples.websocket.echo.CustomContainerWebSocketsApplicationTests.CustomContainerConfiguration;
 
 import static org.junit.Assert.assertEquals;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = { SampleWebSocketsApplication.class,
+@SpringApplicationConfiguration(classes = { SampleTomcatWebSocketApplication.class,
 		CustomContainerConfiguration.class })
 @WebAppConfiguration
 @IntegrationTest
@@ -63,14 +63,6 @@ public class CustomContainerWebSocketsApplicationTests {
 
 	private static int PORT = SocketUtils.findAvailableTcpPort();
 
-	@Configuration
-	protected static class CustomContainerConfiguration {
-		@Bean
-		public EmbeddedServletContainerFactory embeddedServletContainerFactory() {
-			return new TomcatEmbeddedServletContainerFactory("/ws", PORT);
-		}
-	}
-
 	@Test
 	public void echoEndpoint() throws Exception {
 		ConfigurableApplicationContext context = new SpringApplicationBuilder(
@@ -99,6 +91,16 @@ public class CustomContainerWebSocketsApplicationTests {
 		assertEquals("Reversed: !dlrow olleH", messagePayloadReference.get());
 	}
 
+	@Configuration
+	protected static class CustomContainerConfiguration {
+
+		@Bean
+		public EmbeddedServletContainerFactory embeddedServletContainerFactory() {
+			return new TomcatEmbeddedServletContainerFactory("/ws", PORT);
+		}
+
+	}
+
 	@Configuration
 	static class ClientConfiguration implements CommandLineRunner {
 
@@ -145,6 +147,7 @@ public class CustomContainerWebSocketsApplicationTests {
 		public GreetingService greetingService() {
 			return new SimpleGreetingService();
 		}
+
 	}
 
 }
diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/test/java/samples/websocket/snake/SnakeTimerTests.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/snake/SnakeTimerTests.java
similarity index 100%
rename from spring-boot-samples/spring-boot-sample-websocket/src/test/java/samples/websocket/snake/SnakeTimerTests.java
rename to spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/snake/SnakeTimerTests.java
diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/config/SampleUndertowWebSocketsApplication.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/SampleUndertowWebSocketsApplication.java
similarity index 93%
rename from spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/config/SampleUndertowWebSocketsApplication.java
rename to spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/SampleUndertowWebSocketsApplication.java
index 054a5eb3b0..938fc1d4f5 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/config/SampleUndertowWebSocketsApplication.java
+++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/SampleUndertowWebSocketsApplication.java
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package samples.websocket.config;
+package samples.websocket;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.context.web.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.web.socket.WebSocketHandler;
 import org.springframework.web.socket.config.annotation.EnableWebSocket;
 import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
@@ -36,7 +37,8 @@ import samples.websocket.echo.EchoWebSocketHandler;
 import samples.websocket.reverse.ReverseWebSocketEndpoint;
 import samples.websocket.snake.SnakeWebSocketHandler;
 
-@SpringBootApplication
+@Configuration
+@EnableAutoConfiguration
 @EnableWebSocket
 public class SampleUndertowWebSocketsApplication extends SpringBootServletInitializer
 		implements WebSocketConfigurer {
diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/resources/static/echo.html b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/resources/static/echo.html
index 0ffca05b4d..9a0a7650bf 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/resources/static/echo.html
+++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/resources/static/echo.html
@@ -1,133 +1,134 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You 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
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You 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
+	  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.
+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.
 -->
+
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Apache Tomcat WebSocket Examples: Echo</title>
-    <style type="text/css">
-        #connect-container {
-            float: left;
-            width: 400px
-        }
+	<title>Apache Tomcat WebSocket Examples: Echo</title>
+	<style type="text/css">
+		#connect-container {
+			float: left;
+			width: 400px
+		}
 
-        #connect-container div {
-            padding: 5px;
-        }
+		#connect-container div {
+			padding: 5px;
+		}
 
-        #console-container {
-            float: left;
-            margin-left: 15px;
-            width: 400px;
-        }
+		#console-container {
+			float: left;
+			margin-left: 15px;
+			width: 400px;
+		}
 
-        #console {
-            border: 1px solid #CCCCCC;
-            border-right-color: #999999;
-            border-bottom-color: #999999;
-            height: 170px;
-            overflow-y: scroll;
-            padding: 5px;
-            width: 100%;
-        }
+		#console {
+			border: 1px solid #CCCCCC;
+			border-right-color: #999999;
+			border-bottom-color: #999999;
+			height: 170px;
+			overflow-y: scroll;
+			padding: 5px;
+			width: 100%;
+		}
 
-        #console p {
-            padding: 0;
-            margin: 0;
-        }
-    </style>
-    <script src="https://cdn.jsdelivr.net/sockjs/0.3.4/sockjs.min.js"></script>
-    <script type="text/javascript">
-        var ws = null;
+		#console p {
+			padding: 0;
+			margin: 0;
+		}
+	</style>
+	<script src="https://cdn.jsdelivr.net/sockjs/0.3.4/sockjs.min.js"></script>
+	<script type="text/javascript">
+		var ws = null;
 
-        function setConnected(connected) {
-            document.getElementById('connect').disabled = connected;
-            document.getElementById('disconnect').disabled = !connected;
-            document.getElementById('echo').disabled = !connected;
-        }
+		function setConnected(connected) {
+			document.getElementById('connect').disabled = connected;
+			document.getElementById('disconnect').disabled = !connected;
+			document.getElementById('echo').disabled = !connected;
+		}
 
-        function connect() {
-            var target = document.getElementById('target').value;
-            ws = new SockJS(target);
-            ws.onopen = function () {
-                setConnected(true);
-                log('Info: WebSocket connection opened.');
-            };
-            ws.onmessage = function (event) {
-                log('Received: ' + event.data);
-            };
-            ws.onclose = function () {
-                setConnected(false);
-                log('Info: WebSocket connection closed.');
-            };
-        }
+		function connect() {
+			var target = document.getElementById('target').value;
+			ws = new SockJS(target);
+			ws.onopen = function () {
+				setConnected(true);
+				log('Info: WebSocket connection opened.');
+			};
+			ws.onmessage = function (event) {
+				log('Received: ' + event.data);
+			};
+			ws.onclose = function () {
+				setConnected(false);
+				log('Info: WebSocket connection closed.');
+			};
+		}
 
-        function disconnect() {
-            if (ws != null) {
-                ws.close();
-                ws = null;
-            }
-            setConnected(false);
-        }
+		function disconnect() {
+			if (ws != null) {
+				ws.close();
+				ws = null;
+			}
+			setConnected(false);
+		}
 
-        function echo() {
-            if (ws != null) {
-                var message = document.getElementById('message').value;
-                log('Sent: ' + message);
-                ws.send(message);
-            } else {
-                alert('WebSocket connection not established, please connect.');
-            }
-        }
+		function echo() {
+			if (ws != null) {
+				var message = document.getElementById('message').value;
+				log('Sent: ' + message);
+				ws.send(message);
+			} else {
+				alert('WebSocket connection not established, please connect.');
+			}
+		}
 
-        function log(message) {
-            var console = document.getElementById('console');
-            var p = document.createElement('p');
-            p.style.wordWrap = 'break-word';
-            p.appendChild(document.createTextNode(message));
-            console.appendChild(p);
-            while (console.childNodes.length > 25) {
-                console.removeChild(console.firstChild);
-            }
-            console.scrollTop = console.scrollHeight;
-        }
-    </script>
+		function log(message) {
+			var console = document.getElementById('console');
+			var p = document.createElement('p');
+			p.style.wordWrap = 'break-word';
+			p.appendChild(document.createTextNode(message));
+			console.appendChild(p);
+			while (console.childNodes.length > 25) {
+				console.removeChild(console.firstChild);
+			}
+			console.scrollTop = console.scrollHeight;
+		}
+	</script>
 </head>
 <body>
 <noscript><h2 style="color: #ff0000">Seems your browser doesn't support Javascript! Websockets rely on Javascript being enabled. Please enable
-    Javascript and reload this page!</h2></noscript>
+	Javascript and reload this page!</h2></noscript>
 <div>
-    <div id="connect-container">
-        <div>
-            <input id="target" type="text" size="40" style="width: 350px" value="/echo"/>
-        </div>
-        <div>
-            <button id="connect" onclick="connect();">Connect</button>
-            <button id="disconnect" disabled="disabled" onclick="disconnect();">Disconnect</button>
-        </div>
-        <div>
-            <textarea id="message" style="width: 350px">Here is a message!</textarea>
-        </div>
-        <div>
-            <button id="echo" onclick="echo();" disabled="disabled">Echo message</button>
-        </div>
-    </div>
-    <div id="console-container">
-        <div id="console"></div>
-    </div>
+	<div id="connect-container">
+		<div>
+			<input id="target" type="text" size="40" style="width: 350px" value="/echo"/>
+		</div>
+		<div>
+			<button id="connect" onclick="connect();">Connect</button>
+			<button id="disconnect" disabled="disabled" onclick="disconnect();">Disconnect</button>
+		</div>
+		<div>
+			<textarea id="message" style="width: 350px">Here is a message!</textarea>
+		</div>
+		<div>
+			<button id="echo" onclick="echo();" disabled="disabled">Echo message</button>
+		</div>
+	</div>
+	<div id="console-container">
+		<div id="console"></div>
+	</div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/resources/static/index.html b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/resources/static/index.html
index e2b76b6e44..e9585067a3 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/resources/static/index.html
+++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/resources/static/index.html
@@ -1,32 +1,33 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You 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
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You 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
+	  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.
+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.
 -->
+
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Apache Tomcat WebSocket Examples: Index</title>
+	<title>Apache Tomcat WebSocket Examples: Index</title>
 </head>
 <body>
 <noscript><h2 style="color: #ff0000">Seems your browser doesn't support Javascript! Websockets rely on Javascript being enabled. Please enable
-    Javascript and reload this page!</h2></noscript>
+	Javascript and reload this page!</h2></noscript>
 <p>Please select the sample you would like to try.</p>
 <ul>
-    <li><a href="./echo.html">Echo</a></li>
-    <li><a href="./reverse.html">Reverse</a></li>
-    <li><a href="./snake.html">Snake</a></li>
+	<li><a href="./echo.html">Echo</a></li>
+	<li><a href="./reverse.html">Reverse</a></li>
+	<li><a href="./snake.html">Snake</a></li>
 </ul>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/resources/static/reverse.html b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/resources/static/reverse.html
index 96aaf25de7..be2c043930 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/resources/static/reverse.html
+++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/resources/static/reverse.html
@@ -1,140 +1,141 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You 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
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You 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
+	  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.
+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.
 -->
+
 <!DOCTYPE html>
 <html>
 <head>
-    <title>WebSocket Examples: Reverse</title>
-    <style type="text/css">
-        #connect-container {
-            float: left;
-            width: 400px
-        }
+	<title>WebSocket Examples: Reverse</title>
+	<style type="text/css">
+		#connect-container {
+			float: left;
+			width: 400px
+		}
 
-        #connect-container div {
-            padding: 5px;
-        }
+		#connect-container div {
+			padding: 5px;
+		}
 
-        #console-container {
-            float: left;
-            margin-left: 15px;
-            width: 400px;
-        }
+		#console-container {
+			float: left;
+			margin-left: 15px;
+			width: 400px;
+		}
 
-        #console {
-            border: 1px solid #CCCCCC;
-            border-right-color: #999999;
-            border-bottom-color: #999999;
-            height: 170px;
-            overflow-y: scroll;
-            padding: 5px;
-            width: 100%;
-        }
+		#console {
+			border: 1px solid #CCCCCC;
+			border-right-color: #999999;
+			border-bottom-color: #999999;
+			height: 170px;
+			overflow-y: scroll;
+			padding: 5px;
+			width: 100%;
+		}
 
-        #console p {
-            padding: 0;
-            margin: 0;
-        }
-    </style>
-    <script type="text/javascript">
-        var ws = null;
+		#console p {
+			padding: 0;
+			margin: 0;
+		}
+	</style>
+	<script type="text/javascript">
+		var ws = null;
 
-        function setConnected(connected) {
-            document.getElementById('connect').disabled = connected;
-            document.getElementById('disconnect').disabled = !connected;
-            document.getElementById('reverse').disabled = !connected;
-        }
+		function setConnected(connected) {
+			document.getElementById('connect').disabled = connected;
+			document.getElementById('disconnect').disabled = !connected;
+			document.getElementById('reverse').disabled = !connected;
+		}
 
-        function connect() {
-            var target = document.getElementById('target').value;
-            ws = new WebSocket(target);
-            ws.onopen = function () {
-                setConnected(true);
-                log('Info: WebSocket connection opened.');
-            };
-            ws.onmessage = function (event) {
-                log('Received: ' + event.data);
-            };
-            ws.onclose = function () {
-                setConnected(false);
-                log('Info: WebSocket connection closed.');
-            };
-        }
+		function connect() {
+			var target = document.getElementById('target').value;
+			ws = new WebSocket(target);
+			ws.onopen = function () {
+				setConnected(true);
+				log('Info: WebSocket connection opened.');
+			};
+			ws.onmessage = function (event) {
+				log('Received: ' + event.data);
+			};
+			ws.onclose = function () {
+				setConnected(false);
+				log('Info: WebSocket connection closed.');
+			};
+		}
 
-        function updateTarget() {
-            if (window.location.protocol == 'http:') {
-                document.getElementById('target').value = 'ws://' + window.location.host + document.getElementById('target').value;
-            } else {
-                document.getElementById('target').value = 'wss://' + window.location.host + document.getElementById('target').value;
-            }
-        }
+		function updateTarget() {
+			if (window.location.protocol == 'http:') {
+				document.getElementById('target').value = 'ws://' + window.location.host + document.getElementById('target').value;
+			} else {
+				document.getElementById('target').value = 'wss://' + window.location.host + document.getElementById('target').value;
+			}
+		}
 
-        function disconnect() {
-            if (ws != null) {
-                ws.close();
-                ws = null;
-            }
-            setConnected(false);
-        }
+		function disconnect() {
+			if (ws != null) {
+				ws.close();
+				ws = null;
+			}
+			setConnected(false);
+		}
 
-        function reverse() {
-            if (ws != null) {
-                var message = document.getElementById('message').value;
-                log('Sent: ' + message);
-                ws.send(message);
-            } else {
-                alert('WebSocket connection not established, please connect.');
-            }
-        }
+		function reverse() {
+			if (ws != null) {
+				var message = document.getElementById('message').value;
+				log('Sent: ' + message);
+				ws.send(message);
+			} else {
+				alert('WebSocket connection not established, please connect.');
+			}
+		}
 
-        function log(message) {
-            var console = document.getElementById('console');
-            var p = document.createElement('p');
-            p.style.wordWrap = 'break-word';
-            p.appendChild(document.createTextNode(message));
-            console.appendChild(p);
-            while (console.childNodes.length > 25) {
-                console.removeChild(console.firstChild);
-            }
-            console.scrollTop = console.scrollHeight;
-        }
-    </script>
+		function log(message) {
+			var console = document.getElementById('console');
+			var p = document.createElement('p');
+			p.style.wordWrap = 'break-word';
+			p.appendChild(document.createTextNode(message));
+			console.appendChild(p);
+			while (console.childNodes.length > 25) {
+				console.removeChild(console.firstChild);
+			}
+			console.scrollTop = console.scrollHeight;
+		}
+	</script>
 </head>
 <body onload="updateTarget()">
 <noscript><h2 style="color: #ff0000">Seems your browser doesn't support Javascript! Websockets rely on Javascript being enabled. Please enable
-    Javascript and reload this page!</h2></noscript>
+	Javascript and reload this page!</h2></noscript>
 <div>
-    <div id="connect-container">
-        <div>
-            <input id="target" type="text" size="40" style="width: 350px" value="/reverse"/>
-        </div>
-        <div>
-            <button id="connect" onclick="connect();">Connect</button>
-            <button id="disconnect" disabled="disabled" onclick="disconnect();">Disconnect</button>
-        </div>
-        <div>
-            <textarea id="message" style="width: 350px">Here is a message!</textarea>
-        </div>
-        <div>
-            <button id="reverse" onclick="reverse();" disabled="disabled">Reverse message</button>
-        </div>
-    </div>
-    <div id="console-container">
-        <div id="console"></div>
-    </div>
+	<div id="connect-container">
+		<div>
+			<input id="target" type="text" size="40" style="width: 350px" value="/reverse"/>
+		</div>
+		<div>
+			<button id="connect" onclick="connect();">Connect</button>
+			<button id="disconnect" disabled="disabled" onclick="disconnect();">Disconnect</button>
+		</div>
+		<div>
+			<textarea id="message" style="width: 350px">Here is a message!</textarea>
+		</div>
+		<div>
+			<button id="reverse" onclick="reverse();" disabled="disabled">Reverse message</button>
+		</div>
+	</div>
+	<div id="console-container">
+		<div id="console"></div>
+	</div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/resources/static/snake.html b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/resources/static/snake.html
index 5728fc0144..d305381069 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/resources/static/snake.html
+++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/resources/static/snake.html
@@ -1,249 +1,250 @@
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You 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
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You 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
+	  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.
+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.
 -->
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+		"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title>Apache Tomcat WebSocket Examples: Multiplayer Snake</title>
-    <style type="text/css">
-        #playground {
-            width: 640px;
-            height: 480px;
-            background-color: #000;
-        }
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+	<title>Apache Tomcat WebSocket Examples: Multiplayer Snake</title>
+	<style type="text/css">
+		#playground {
+			width: 640px;
+			height: 480px;
+			background-color: #000;
+		}
 
-        #console-container {
-            float: left;
-            margin-left: 15px;
-            width: 300px;
-        }
+		#console-container {
+			float: left;
+			margin-left: 15px;
+			width: 300px;
+		}
 
-        #console {
-            border: 1px solid #CCCCCC;
-            border-right-color: #999999;
-            border-bottom-color: #999999;
-            height: 480px;
-            overflow-y: scroll;
-            padding-left: 5px;
-            padding-right: 5px;
-            width: 100%;
-        }
+		#console {
+			border: 1px solid #CCCCCC;
+			border-right-color: #999999;
+			border-bottom-color: #999999;
+			height: 480px;
+			overflow-y: scroll;
+			padding-left: 5px;
+			padding-right: 5px;
+			width: 100%;
+		}
 
-        #console p {
-            padding: 0;
-            margin: 0;
-        }
-    </style>
-    <script src="https://cdn.jsdelivr.net/sockjs/0.3.4/sockjs.min.js"></script>
+		#console p {
+			padding: 0;
+			margin: 0;
+		}
+	</style>
+	<script src="https://cdn.jsdelivr.net/sockjs/0.3.4/sockjs.min.js"></script>
 </head>
 <body>
-    <noscript><h2 style="color: #ff0000">Seems your browser doesn't support Javascript! Websockets rely on Javascript being enabled. Please enable
-    Javascript and reload this page!</h2></noscript>
+	<noscript><h2 style="color: #ff0000">Seems your browser doesn't support Javascript! Websockets rely on Javascript being enabled. Please enable
+	Javascript and reload this page!</h2></noscript>
 
-    <div style="float: left">
-        <canvas id="playground" width="640" height="480"></canvas>
-    </div>
-    <div id="console-container">
-        <div id="console"></div>
-    </div>
-    <script type="text/javascript">
+	<div style="float: left">
+		<canvas id="playground" width="640" height="480"></canvas>
+	</div>
+	<div id="console-container">
+		<div id="console"></div>
+	</div>
+	<script type="text/javascript">
 
-        var Game = {};
+		var Game = {};
 
-        Game.fps = 30;
-        Game.socket = null;
-        Game.nextFrame = null;
-        Game.interval = null;
-        Game.direction = 'none';
-        Game.gridSize = 10;
+		Game.fps = 30;
+		Game.socket = null;
+		Game.nextFrame = null;
+		Game.interval = null;
+		Game.direction = 'none';
+		Game.gridSize = 10;
 
-        function Snake() {
-            this.snakeBody = [];
-            this.color = null;
-        }
+		function Snake() {
+			this.snakeBody = [];
+			this.color = null;
+		}
 
-        Snake.prototype.draw = function(context) {
-            for (var id in this.snakeBody) {
-                context.fillStyle = this.color;
-                context.fillRect(this.snakeBody[id].x, this.snakeBody[id].y, Game.gridSize, Game.gridSize);
-            }
-        };
+		Snake.prototype.draw = function(context) {
+			for (var id in this.snakeBody) {
+				context.fillStyle = this.color;
+				context.fillRect(this.snakeBody[id].x, this.snakeBody[id].y, Game.gridSize, Game.gridSize);
+			}
+		};
 
-        Game.initialize = function() {
-            this.entities = [];
-            canvas = document.getElementById('playground');
-            if (!canvas.getContext) {
-                Console.log('Error: 2d canvas not supported by this browser.');
-                return;
-            }
-            this.context = canvas.getContext('2d');
-            window.addEventListener('keydown', function (e) {
-                var code = e.keyCode;
-                if (code > 36 && code < 41) {
-                    switch (code) {
-                        case 37:
-                            if (Game.direction != 'east') Game.setDirection('west');
-                            break;
-                        case 38:
-                            if (Game.direction != 'south') Game.setDirection('north');
-                            break;
-                        case 39:
-                            if (Game.direction != 'west') Game.setDirection('east');
-                            break;
-                        case 40:
-                            if (Game.direction != 'north') Game.setDirection('south');
-                            break;
-                    }
-                }
-            }, false);
-            Game.connect();
-        };
+		Game.initialize = function() {
+			this.entities = [];
+			canvas = document.getElementById('playground');
+			if (!canvas.getContext) {
+				Console.log('Error: 2d canvas not supported by this browser.');
+				return;
+			}
+			this.context = canvas.getContext('2d');
+			window.addEventListener('keydown', function (e) {
+				var code = e.keyCode;
+				if (code > 36 && code < 41) {
+					switch (code) {
+						case 37:
+							if (Game.direction != 'east') Game.setDirection('west');
+							break;
+						case 38:
+							if (Game.direction != 'south') Game.setDirection('north');
+							break;
+						case 39:
+							if (Game.direction != 'west') Game.setDirection('east');
+							break;
+						case 40:
+							if (Game.direction != 'north') Game.setDirection('south');
+							break;
+					}
+				}
+			}, false);
+			Game.connect();
+		};
 
-        Game.setDirection  = function(direction) {
-            Game.direction = direction;
-            Game.socket.send(direction);
-            Console.log('Sent: Direction ' + direction);
-        };
+		Game.setDirection  = function(direction) {
+			Game.direction = direction;
+			Game.socket.send(direction);
+			Console.log('Sent: Direction ' + direction);
+		};
 
-        Game.startGameLoop = function() {
-            if (window.webkitRequestAnimationFrame) {
-                Game.nextFrame = function () {
-                    webkitRequestAnimationFrame(Game.run);
-                };
-            } else if (window.mozRequestAnimationFrame) {
-                Game.nextFrame = function () {
-                    mozRequestAnimationFrame(Game.run);
-                };
-            } else {
-                Game.interval = setInterval(Game.run, 1000 / Game.fps);
-            }
-            if (Game.nextFrame != null) {
-                Game.nextFrame();
-            }
-        };
+		Game.startGameLoop = function() {
+			if (window.webkitRequestAnimationFrame) {
+				Game.nextFrame = function () {
+					webkitRequestAnimationFrame(Game.run);
+				};
+			} else if (window.mozRequestAnimationFrame) {
+				Game.nextFrame = function () {
+					mozRequestAnimationFrame(Game.run);
+				};
+			} else {
+				Game.interval = setInterval(Game.run, 1000 / Game.fps);
+			}
+			if (Game.nextFrame != null) {
+				Game.nextFrame();
+			}
+		};
 
-        Game.stopGameLoop = function () {
-            Game.nextFrame = null;
-            if (Game.interval != null) {
-                clearInterval(Game.interval);
-            }
-        };
+		Game.stopGameLoop = function () {
+			Game.nextFrame = null;
+			if (Game.interval != null) {
+				clearInterval(Game.interval);
+			}
+		};
 
-        Game.draw = function() {
-            this.context.clearRect(0, 0, 640, 480);
-            for (var id in this.entities) {
-                this.entities[id].draw(this.context);
-            }
-        };
+		Game.draw = function() {
+			this.context.clearRect(0, 0, 640, 480);
+			for (var id in this.entities) {
+				this.entities[id].draw(this.context);
+			}
+		};
 
-        Game.addSnake = function(id, color) {
-            Game.entities[id] = new Snake();
-            Game.entities[id].color = color;
-        };
+		Game.addSnake = function(id, color) {
+			Game.entities[id] = new Snake();
+			Game.entities[id].color = color;
+		};
 
-        Game.updateSnake = function(id, snakeBody) {
-            if (typeof Game.entities[id] != "undefined") {
-                Game.entities[id].snakeBody = snakeBody;
-            }
-        };
+		Game.updateSnake = function(id, snakeBody) {
+			if (typeof Game.entities[id] != "undefined") {
+				Game.entities[id].snakeBody = snakeBody;
+			}
+		};
 
-        Game.removeSnake = function(id) {
-            Game.entities[id] = null;
-            // Force GC.
-            delete Game.entities[id];
-        };
+		Game.removeSnake = function(id) {
+			Game.entities[id] = null;
+			// Force GC.
+			delete Game.entities[id];
+		};
 
-        Game.run = (function() {
-            var skipTicks = 1000 / Game.fps, nextGameTick = (new Date).getTime();
+		Game.run = (function() {
+			var skipTicks = 1000 / Game.fps, nextGameTick = (new Date).getTime();
 
-            return function() {
-                while ((new Date).getTime() > nextGameTick) {
-                    nextGameTick += skipTicks;
-                }
-                Game.draw();
-                if (Game.nextFrame != null) {
-                    Game.nextFrame();
-                }
-            };
-        })();
+			return function() {
+				while ((new Date).getTime() > nextGameTick) {
+					nextGameTick += skipTicks;
+				}
+				Game.draw();
+				if (Game.nextFrame != null) {
+					Game.nextFrame();
+				}
+			};
+		})();
 
-        Game.connect = (function() {
-        	Game.socket = new SockJS("/snake");
+		Game.connect = (function() {
+			Game.socket = new SockJS("/snake");
 
-            Game.socket.onopen = function () {
-                // Socket open.. start the game loop.
-                Console.log('Info: WebSocket connection opened.');
-                Console.log('Info: Press an arrow key to begin.');
-                Game.startGameLoop();
-                setInterval(function() {
-                    // Prevent server read timeout.
-                    Game.socket.send('ping');
-                }, 5000);
-            };
+			Game.socket.onopen = function () {
+				// Socket open.. start the game loop.
+				Console.log('Info: WebSocket connection opened.');
+				Console.log('Info: Press an arrow key to begin.');
+				Game.startGameLoop();
+				setInterval(function() {
+					// Prevent server read timeout.
+					Game.socket.send('ping');
+				}, 5000);
+			};
 
-            Game.socket.onclose = function () {
-                Console.log('Info: WebSocket closed.');
-                Game.stopGameLoop();
-            };
+			Game.socket.onclose = function () {
+				Console.log('Info: WebSocket closed.');
+				Game.stopGameLoop();
+			};
 
-            Game.socket.onmessage = function (message) {
-                // _Potential_ security hole, consider using json lib to parse data in production.
-                var packet = eval('(' + message.data + ')');
-                switch (packet.type) {
-                    case 'update':
-                        for (var i = 0; i < packet.data.length; i++) {
-                            Game.updateSnake(packet.data[i].id, packet.data[i].body);
-                        }
-                        break;
-                    case 'join':
-                        for (var j = 0; j < packet.data.length; j++) {
-                            Game.addSnake(packet.data[j].id, packet.data[j].color);
-                        }
-                        break;
-                    case 'leave':
-                        Game.removeSnake(packet.id);
-                        break;
-                    case 'dead':
-                        Console.log('Info: Your snake is dead, bad luck!');
-                        Game.direction = 'none';
-                        break;
-                    case 'kill':
-                        Console.log('Info: Head shot!');
-                        break;
-                }
-            };
-        });
+			Game.socket.onmessage = function (message) {
+				// _Potential_ security hole, consider using json lib to parse data in production.
+				var packet = eval('(' + message.data + ')');
+				switch (packet.type) {
+					case 'update':
+						for (var i = 0; i < packet.data.length; i++) {
+							Game.updateSnake(packet.data[i].id, packet.data[i].body);
+						}
+						break;
+					case 'join':
+						for (var j = 0; j < packet.data.length; j++) {
+							Game.addSnake(packet.data[j].id, packet.data[j].color);
+						}
+						break;
+					case 'leave':
+						Game.removeSnake(packet.id);
+						break;
+					case 'dead':
+						Console.log('Info: Your snake is dead, bad luck!');
+						Game.direction = 'none';
+						break;
+					case 'kill':
+						Console.log('Info: Head shot!');
+						break;
+				}
+			};
+		});
 
-        var Console = {};
+		var Console = {};
 
-        Console.log = (function(message) {
-            var console = document.getElementById('console');
-            var p = document.createElement('p');
-            p.style.wordWrap = 'break-word';
-            p.innerHTML = message;
-            console.appendChild(p);
-            while (console.childNodes.length > 25) {
-                console.removeChild(console.firstChild);
-            }
-            console.scrollTop = console.scrollHeight;
-        });
+		Console.log = (function(message) {
+			var console = document.getElementById('console');
+			var p = document.createElement('p');
+			p.style.wordWrap = 'break-word';
+			p.innerHTML = message;
+			console.appendChild(p);
+			while (console.childNodes.length > 25) {
+				console.removeChild(console.firstChild);
+			}
+			console.scrollTop = console.scrollHeight;
+		});
 
-        Game.initialize();
-    </script>
+		Game.initialize();
+	</script>
 </body>
 </html>
diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/SampleWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/SampleWebSocketsApplicationTests.java
index fee7e46e74..f93e2fb5da 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/SampleWebSocketsApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/SampleWebSocketsApplicationTests.java
@@ -42,7 +42,6 @@ import org.springframework.web.socket.client.standard.StandardWebSocketClient;
 import samples.websocket.client.GreetingService;
 import samples.websocket.client.SimpleClientWebSocketHandler;
 import samples.websocket.client.SimpleGreetingService;
-import samples.websocket.config.SampleUndertowWebSocketsApplication;
 
 import static org.junit.Assert.assertEquals;
 
@@ -133,6 +132,7 @@ public class SampleWebSocketsApplicationTests {
 		public GreetingService greetingService() {
 			return new SimpleGreetingService();
 		}
+
 	}
 
 }
diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/echo/CustomContainerWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/echo/CustomContainerWebSocketsApplicationTests.java
index 302d560cbb..4501e44323 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/echo/CustomContainerWebSocketsApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/echo/CustomContainerWebSocketsApplicationTests.java
@@ -42,10 +42,10 @@ import org.springframework.util.SocketUtils;
 import org.springframework.web.socket.client.WebSocketConnectionManager;
 import org.springframework.web.socket.client.standard.StandardWebSocketClient;
 
+import samples.websocket.SampleUndertowWebSocketsApplication;
 import samples.websocket.client.GreetingService;
 import samples.websocket.client.SimpleClientWebSocketHandler;
 import samples.websocket.client.SimpleGreetingService;
-import samples.websocket.config.SampleUndertowWebSocketsApplication;
 import samples.websocket.echo.CustomContainerWebSocketsApplicationTests.CustomContainerConfiguration;
 
 import static org.junit.Assert.assertEquals;
@@ -63,14 +63,6 @@ public class CustomContainerWebSocketsApplicationTests {
 
 	private static int PORT = SocketUtils.findAvailableTcpPort();
 
-	@Configuration
-	protected static class CustomContainerConfiguration {
-		@Bean
-		public EmbeddedServletContainerFactory embeddedServletContainerFactory() {
-			return new UndertowEmbeddedServletContainerFactory("/ws", PORT);
-		}
-	}
-
 	@Test
 	public void echoEndpoint() throws Exception {
 		ConfigurableApplicationContext context = new SpringApplicationBuilder(
@@ -99,6 +91,16 @@ public class CustomContainerWebSocketsApplicationTests {
 		assertEquals("Reversed: !dlrow olleH", messagePayloadReference.get());
 	}
 
+	@Configuration
+	protected static class CustomContainerConfiguration {
+
+		@Bean
+		public EmbeddedServletContainerFactory embeddedServletContainerFactory() {
+			return new UndertowEmbeddedServletContainerFactory("/ws", PORT);
+		}
+
+	}
+
 	@Configuration
 	static class ClientConfiguration implements CommandLineRunner {
 
@@ -145,6 +147,7 @@ public class CustomContainerWebSocketsApplicationTests {
 		public GreetingService greetingService() {
 			return new SimpleGreetingService();
 		}
+
 	}
 
 }
diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/resources/static/echo.html b/spring-boot-samples/spring-boot-sample-websocket/src/main/resources/static/echo.html
deleted file mode 100644
index 0ffca05b4d..0000000000
--- a/spring-boot-samples/spring-boot-sample-websocket/src/main/resources/static/echo.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You 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.
--->
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Apache Tomcat WebSocket Examples: Echo</title>
-    <style type="text/css">
-        #connect-container {
-            float: left;
-            width: 400px
-        }
-
-        #connect-container div {
-            padding: 5px;
-        }
-
-        #console-container {
-            float: left;
-            margin-left: 15px;
-            width: 400px;
-        }
-
-        #console {
-            border: 1px solid #CCCCCC;
-            border-right-color: #999999;
-            border-bottom-color: #999999;
-            height: 170px;
-            overflow-y: scroll;
-            padding: 5px;
-            width: 100%;
-        }
-
-        #console p {
-            padding: 0;
-            margin: 0;
-        }
-    </style>
-    <script src="https://cdn.jsdelivr.net/sockjs/0.3.4/sockjs.min.js"></script>
-    <script type="text/javascript">
-        var ws = null;
-
-        function setConnected(connected) {
-            document.getElementById('connect').disabled = connected;
-            document.getElementById('disconnect').disabled = !connected;
-            document.getElementById('echo').disabled = !connected;
-        }
-
-        function connect() {
-            var target = document.getElementById('target').value;
-            ws = new SockJS(target);
-            ws.onopen = function () {
-                setConnected(true);
-                log('Info: WebSocket connection opened.');
-            };
-            ws.onmessage = function (event) {
-                log('Received: ' + event.data);
-            };
-            ws.onclose = function () {
-                setConnected(false);
-                log('Info: WebSocket connection closed.');
-            };
-        }
-
-        function disconnect() {
-            if (ws != null) {
-                ws.close();
-                ws = null;
-            }
-            setConnected(false);
-        }
-
-        function echo() {
-            if (ws != null) {
-                var message = document.getElementById('message').value;
-                log('Sent: ' + message);
-                ws.send(message);
-            } else {
-                alert('WebSocket connection not established, please connect.');
-            }
-        }
-
-        function log(message) {
-            var console = document.getElementById('console');
-            var p = document.createElement('p');
-            p.style.wordWrap = 'break-word';
-            p.appendChild(document.createTextNode(message));
-            console.appendChild(p);
-            while (console.childNodes.length > 25) {
-                console.removeChild(console.firstChild);
-            }
-            console.scrollTop = console.scrollHeight;
-        }
-    </script>
-</head>
-<body>
-<noscript><h2 style="color: #ff0000">Seems your browser doesn't support Javascript! Websockets rely on Javascript being enabled. Please enable
-    Javascript and reload this page!</h2></noscript>
-<div>
-    <div id="connect-container">
-        <div>
-            <input id="target" type="text" size="40" style="width: 350px" value="/echo"/>
-        </div>
-        <div>
-            <button id="connect" onclick="connect();">Connect</button>
-            <button id="disconnect" disabled="disabled" onclick="disconnect();">Disconnect</button>
-        </div>
-        <div>
-            <textarea id="message" style="width: 350px">Here is a message!</textarea>
-        </div>
-        <div>
-            <button id="echo" onclick="echo();" disabled="disabled">Echo message</button>
-        </div>
-    </div>
-    <div id="console-container">
-        <div id="console"></div>
-    </div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/resources/static/index.html b/spring-boot-samples/spring-boot-sample-websocket/src/main/resources/static/index.html
deleted file mode 100644
index e2b76b6e44..0000000000
--- a/spring-boot-samples/spring-boot-sample-websocket/src/main/resources/static/index.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You 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.
--->
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Apache Tomcat WebSocket Examples: Index</title>
-</head>
-<body>
-<noscript><h2 style="color: #ff0000">Seems your browser doesn't support Javascript! Websockets rely on Javascript being enabled. Please enable
-    Javascript and reload this page!</h2></noscript>
-<p>Please select the sample you would like to try.</p>
-<ul>
-    <li><a href="./echo.html">Echo</a></li>
-    <li><a href="./reverse.html">Reverse</a></li>
-    <li><a href="./snake.html">Snake</a></li>
-</ul>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/resources/static/reverse.html b/spring-boot-samples/spring-boot-sample-websocket/src/main/resources/static/reverse.html
deleted file mode 100644
index a87d2e8255..0000000000
--- a/spring-boot-samples/spring-boot-sample-websocket/src/main/resources/static/reverse.html
+++ /dev/null
@@ -1,140 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You 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.
--->
-<!DOCTYPE html>
-<html>
-<head>
-    <title>WebSocket Examples: Reverse</title>
-    <style type="text/css">
-        #connect-container {
-            float: left;
-            width: 400px
-        }
-
-        #connect-container div {
-            padding: 5px;
-        }
-
-        #console-container {
-            float: left;
-            margin-left: 15px;
-            width: 400px;
-        }
-
-        #console {
-            border: 1px solid #CCCCCC;
-            border-right-color: #999999;
-            border-bottom-color: #999999;
-            height: 170px;
-            overflow-y: scroll;
-            padding: 5px;
-            width: 100%;
-        }
-
-        #console p {
-            padding: 0;
-            margin: 0;
-        }
-    </style>
-    <script type="text/javascript">
-        var ws = null;
-
-        function setConnected(connected) {
-            document.getElementById('connect').disabled = connected;
-            document.getElementById('disconnect').disabled = !connected;
-            document.getElementById('reverse').disabled = !connected;
-        }
-
-        function connect() {
-            var target = document.getElementById('target').value;
-            ws = new WebSocket(target);
-            ws.onopen = function () {
-                setConnected(true);
-                log('Info: WebSocket connection opened.');
-            };
-            ws.onmessage = function (event) {
-                log('Received: ' + event.data);
-            };
-            ws.onclose = function () {
-                setConnected(false);
-                log('Info: WebSocket connection closed.');
-            };
-        }
-        
-        function updateTarget() {
-            if (window.location.protocol == 'http:') {
-                document.getElementById('target').value = 'ws://' + window.location.host + document.getElementById('target').value;
-            } else {
-                document.getElementById('target').value = 'wss://' + window.location.host + document.getElementById('target').value;
-            }
-        }
-
-        function disconnect() {
-            if (ws != null) {
-                ws.close();
-                ws = null;
-            }
-            setConnected(false);
-        }
-
-        function reverse() {
-            if (ws != null) {
-                var message = document.getElementById('message').value;
-                log('Sent: ' + message);
-                ws.send(message);
-            } else {
-                alert('WebSocket connection not established, please connect.');
-            }
-        }
-
-        function log(message) {
-            var console = document.getElementById('console');
-            var p = document.createElement('p');
-            p.style.wordWrap = 'break-word';
-            p.appendChild(document.createTextNode(message));
-            console.appendChild(p);
-            while (console.childNodes.length > 25) {
-                console.removeChild(console.firstChild);
-            }
-            console.scrollTop = console.scrollHeight;
-        }
-    </script>
-</head>
-<body onload="updateTarget()">
-<noscript><h2 style="color: #ff0000">Seems your browser doesn't support Javascript! Websockets rely on Javascript being enabled. Please enable
-    Javascript and reload this page!</h2></noscript>
-<div>
-    <div id="connect-container">
-        <div>
-            <input id="target" type="text" size="40" style="width: 350px" value="/reverse"/>
-        </div>
-        <div>
-            <button id="connect" onclick="connect();">Connect</button>
-            <button id="disconnect" disabled="disabled" onclick="disconnect();">Disconnect</button>
-        </div>
-        <div>
-            <textarea id="message" style="width: 350px">Here is a message!</textarea>
-        </div>
-        <div>
-            <button id="reverse" onclick="reverse();" disabled="disabled">Reverse message</button>
-        </div>
-    </div>
-    <div id="console-container">
-        <div id="console"></div>
-    </div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-boot-samples/spring-boot-sample-websocket/src/main/resources/static/snake.html b/spring-boot-samples/spring-boot-sample-websocket/src/main/resources/static/snake.html
deleted file mode 100644
index 5728fc0144..0000000000
--- a/spring-boot-samples/spring-boot-sample-websocket/src/main/resources/static/snake.html
+++ /dev/null
@@ -1,249 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You 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.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title>Apache Tomcat WebSocket Examples: Multiplayer Snake</title>
-    <style type="text/css">
-        #playground {
-            width: 640px;
-            height: 480px;
-            background-color: #000;
-        }
-
-        #console-container {
-            float: left;
-            margin-left: 15px;
-            width: 300px;
-        }
-
-        #console {
-            border: 1px solid #CCCCCC;
-            border-right-color: #999999;
-            border-bottom-color: #999999;
-            height: 480px;
-            overflow-y: scroll;
-            padding-left: 5px;
-            padding-right: 5px;
-            width: 100%;
-        }
-
-        #console p {
-            padding: 0;
-            margin: 0;
-        }
-    </style>
-    <script src="https://cdn.jsdelivr.net/sockjs/0.3.4/sockjs.min.js"></script>
-</head>
-<body>
-    <noscript><h2 style="color: #ff0000">Seems your browser doesn't support Javascript! Websockets rely on Javascript being enabled. Please enable
-    Javascript and reload this page!</h2></noscript>
-
-    <div style="float: left">
-        <canvas id="playground" width="640" height="480"></canvas>
-    </div>
-    <div id="console-container">
-        <div id="console"></div>
-    </div>
-    <script type="text/javascript">
-
-        var Game = {};
-
-        Game.fps = 30;
-        Game.socket = null;
-        Game.nextFrame = null;
-        Game.interval = null;
-        Game.direction = 'none';
-        Game.gridSize = 10;
-
-        function Snake() {
-            this.snakeBody = [];
-            this.color = null;
-        }
-
-        Snake.prototype.draw = function(context) {
-            for (var id in this.snakeBody) {
-                context.fillStyle = this.color;
-                context.fillRect(this.snakeBody[id].x, this.snakeBody[id].y, Game.gridSize, Game.gridSize);
-            }
-        };
-
-        Game.initialize = function() {
-            this.entities = [];
-            canvas = document.getElementById('playground');
-            if (!canvas.getContext) {
-                Console.log('Error: 2d canvas not supported by this browser.');
-                return;
-            }
-            this.context = canvas.getContext('2d');
-            window.addEventListener('keydown', function (e) {
-                var code = e.keyCode;
-                if (code > 36 && code < 41) {
-                    switch (code) {
-                        case 37:
-                            if (Game.direction != 'east') Game.setDirection('west');
-                            break;
-                        case 38:
-                            if (Game.direction != 'south') Game.setDirection('north');
-                            break;
-                        case 39:
-                            if (Game.direction != 'west') Game.setDirection('east');
-                            break;
-                        case 40:
-                            if (Game.direction != 'north') Game.setDirection('south');
-                            break;
-                    }
-                }
-            }, false);
-            Game.connect();
-        };
-
-        Game.setDirection  = function(direction) {
-            Game.direction = direction;
-            Game.socket.send(direction);
-            Console.log('Sent: Direction ' + direction);
-        };
-
-        Game.startGameLoop = function() {
-            if (window.webkitRequestAnimationFrame) {
-                Game.nextFrame = function () {
-                    webkitRequestAnimationFrame(Game.run);
-                };
-            } else if (window.mozRequestAnimationFrame) {
-                Game.nextFrame = function () {
-                    mozRequestAnimationFrame(Game.run);
-                };
-            } else {
-                Game.interval = setInterval(Game.run, 1000 / Game.fps);
-            }
-            if (Game.nextFrame != null) {
-                Game.nextFrame();
-            }
-        };
-
-        Game.stopGameLoop = function () {
-            Game.nextFrame = null;
-            if (Game.interval != null) {
-                clearInterval(Game.interval);
-            }
-        };
-
-        Game.draw = function() {
-            this.context.clearRect(0, 0, 640, 480);
-            for (var id in this.entities) {
-                this.entities[id].draw(this.context);
-            }
-        };
-
-        Game.addSnake = function(id, color) {
-            Game.entities[id] = new Snake();
-            Game.entities[id].color = color;
-        };
-
-        Game.updateSnake = function(id, snakeBody) {
-            if (typeof Game.entities[id] != "undefined") {
-                Game.entities[id].snakeBody = snakeBody;
-            }
-        };
-
-        Game.removeSnake = function(id) {
-            Game.entities[id] = null;
-            // Force GC.
-            delete Game.entities[id];
-        };
-
-        Game.run = (function() {
-            var skipTicks = 1000 / Game.fps, nextGameTick = (new Date).getTime();
-
-            return function() {
-                while ((new Date).getTime() > nextGameTick) {
-                    nextGameTick += skipTicks;
-                }
-                Game.draw();
-                if (Game.nextFrame != null) {
-                    Game.nextFrame();
-                }
-            };
-        })();
-
-        Game.connect = (function() {
-        	Game.socket = new SockJS("/snake");
-
-            Game.socket.onopen = function () {
-                // Socket open.. start the game loop.
-                Console.log('Info: WebSocket connection opened.');
-                Console.log('Info: Press an arrow key to begin.');
-                Game.startGameLoop();
-                setInterval(function() {
-                    // Prevent server read timeout.
-                    Game.socket.send('ping');
-                }, 5000);
-            };
-
-            Game.socket.onclose = function () {
-                Console.log('Info: WebSocket closed.');
-                Game.stopGameLoop();
-            };
-
-            Game.socket.onmessage = function (message) {
-                // _Potential_ security hole, consider using json lib to parse data in production.
-                var packet = eval('(' + message.data + ')');
-                switch (packet.type) {
-                    case 'update':
-                        for (var i = 0; i < packet.data.length; i++) {
-                            Game.updateSnake(packet.data[i].id, packet.data[i].body);
-                        }
-                        break;
-                    case 'join':
-                        for (var j = 0; j < packet.data.length; j++) {
-                            Game.addSnake(packet.data[j].id, packet.data[j].color);
-                        }
-                        break;
-                    case 'leave':
-                        Game.removeSnake(packet.id);
-                        break;
-                    case 'dead':
-                        Console.log('Info: Your snake is dead, bad luck!');
-                        Game.direction = 'none';
-                        break;
-                    case 'kill':
-                        Console.log('Info: Head shot!');
-                        break;
-                }
-            };
-        });
-
-        var Console = {};
-
-        Console.log = (function(message) {
-            var console = document.getElementById('console');
-            var p = document.createElement('p');
-            p.style.wordWrap = 'break-word';
-            p.innerHTML = message;
-            console.appendChild(p);
-            while (console.childNodes.length > 25) {
-                console.removeChild(console.firstChild);
-            }
-            console.scrollTop = console.scrollHeight;
-        });
-
-        Game.initialize();
-    </script>
-</body>
-</html>