From 61e77eeb61394e8e719e4e06216e55491743652e Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@gopivotal.com>
Date: Tue, 15 Jul 2014 08:23:56 -0400
Subject: [PATCH] Fix white spaces

---
 .../socket/config/spring-websocket-4.0.xsd    | 750 +++++++++---------
 .../socket/config/spring-websocket-4.1.xsd    | 746 ++++++++---------
 ...-config-broker-converters-defaults-off.xml |  20 +-
 .../websocket-config-broker-converters.xml    |  20 +-
 ...broker-customchannels-default-executor.xml |  46 +-
 ...websocket-config-broker-customchannels.xml |  54 +-
 .../config/websocket-config-broker-relay.xml  |  28 +-
 .../config/websocket-config-broker-simple.xml |  32 +-
 .../websocket-config-handlers-attributes.xml  |  32 +-
 ...cket-config-handlers-sockjs-attributes.xml |  40 +-
 .../websocket-config-handlers-sockjs.xml      |  20 +-
 .../config/websocket-config-handlers.xml      |  22 +-
 12 files changed, 905 insertions(+), 905 deletions(-)

diff --git a/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.0.xsd b/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.0.xsd
index c2997384ea2..1c355d1af21 100644
--- a/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.0.xsd
+++ b/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.0.xsd
@@ -17,133 +17,133 @@
   -->
 
 <xsd:schema xmlns="http://www.springframework.org/schema/websocket"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:beans="http://www.springframework.org/schema/beans"
-            targetNamespace="http://www.springframework.org/schema/websocket"
-            elementFormDefault="qualified"
-            attributeFormDefault="unqualified">
-
-    <xsd:import namespace="http://www.springframework.org/schema/beans"
-                schemaLocation="http://www.springframework.org/schema/beans/spring-beans-4.0.xsd"/>
-
-    <xsd:complexType name="mapping">
-        <xsd:annotation>
-            <xsd:documentation><![CDATA[
+			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+			xmlns:beans="http://www.springframework.org/schema/beans"
+			targetNamespace="http://www.springframework.org/schema/websocket"
+			elementFormDefault="qualified"
+			attributeFormDefault="unqualified">
+
+	<xsd:import namespace="http://www.springframework.org/schema/beans"
+				schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
+
+	<xsd:complexType name="mapping">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
 	An entry in the registered HandlerMapping that matches a path with a handler.
             ]]></xsd:documentation>
-        </xsd:annotation>
-        <xsd:attribute name="path" type="xsd:string" use="required">
-            <xsd:annotation>
-                <xsd:documentation><![CDATA[
+		</xsd:annotation>
+		<xsd:attribute name="path" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
 	A path that maps a particular request to a handler.
 	Exact path mapping URIs (such as "/myPath") are supported as well as Ant-stype path patterns (such as /myPath/**).
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="handler" type="xsd:string" use="required">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.web.socket.WebSocketHandler"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="handler" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.web.socket.WebSocketHandler"><![CDATA[
     The bean name of a WebSocketHandler to use for requests that match the path configuration.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-    </xsd:complexType>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
 
-    <xsd:complexType name="handshake-handler">
-        <xsd:attribute name="ref" type="xsd:string" use="required">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.web.socket.server.HandshakeHandler"><![CDATA[
+	<xsd:complexType name="handshake-handler">
+		<xsd:attribute name="ref" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.web.socket.server.HandshakeHandler"><![CDATA[
     The bean name of a HandshakeHandler to use for processing WebSocket handshake requests.
     If none specified, a DefaultHandshakeHandler will be configured by default.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-    </xsd:complexType>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
 
-    <xsd:complexType name="handshake-interceptors">
-        <xsd:annotation>
-            <xsd:documentation source="org.springframework.web.socket.server.HandshakeInterceptor"><![CDATA[
+	<xsd:complexType name="handshake-interceptors">
+		<xsd:annotation>
+			<xsd:documentation source="org.springframework.web.socket.server.HandshakeInterceptor"><![CDATA[
 	A list of HandshakeInterceptor beans definition and references.
 	A HandshakeInterceptor can be used to inspect the handshake request and response as well as to pass attributes to the target WebSocketHandler.
 			]]></xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:choice maxOccurs="unbounded">
-                <xsd:element ref="beans:bean">
-                    <xsd:annotation>
-                        <xsd:documentation source="org.springframework.web.socket.server.HandshakeInterceptor"><![CDATA[
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:choice maxOccurs="unbounded">
+				<xsd:element ref="beans:bean">
+					<xsd:annotation>
+						<xsd:documentation source="org.springframework.web.socket.server.HandshakeInterceptor"><![CDATA[
 	A HandshakeInterceptor bean definition.
                         ]]></xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-                <xsd:element ref="beans:ref">
-                    <xsd:annotation>
-                        <xsd:documentation source="org.springframework.web.socket.server.HandshakeInterceptor"><![CDATA[
+					</xsd:annotation>
+				</xsd:element>
+				<xsd:element ref="beans:ref">
+					<xsd:annotation>
+						<xsd:documentation source="org.springframework.web.socket.server.HandshakeInterceptor"><![CDATA[
 	A reference to a HandshakeInterceptor bean.
                     ]]></xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-            </xsd:choice>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="sockjs-service">
-        <xsd:annotation>
-            <xsd:documentation source="org.springframework.web.socket.sockjs.transport.handler.DefaultSockJsService"><![CDATA[
+					</xsd:annotation>
+				</xsd:element>
+			</xsd:choice>
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType name="sockjs-service">
+		<xsd:annotation>
+			<xsd:documentation source="org.springframework.web.socket.sockjs.transport.handler.DefaultSockJsService"><![CDATA[
 	Configures a DefaultSockJsService for processing HTTP requests from SockJS clients.
             ]]></xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:element name="transport-handlers" minOccurs="0" maxOccurs="1">
-                <xsd:annotation>
-                    <xsd:documentation source="org.springframework.web.socket.sockjs.transport.TransportHandler"><![CDATA[
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="transport-handlers" minOccurs="0" maxOccurs="1">
+				<xsd:annotation>
+					<xsd:documentation source="org.springframework.web.socket.sockjs.transport.TransportHandler"><![CDATA[
 	List of TransportHandler beans to be configured for the current handlers element.
 	One can choose not to register the default TransportHandlers and/or override those using
 	custom TransportHandlers.
                 ]]></xsd:documentation>
-                </xsd:annotation>
-                <xsd:complexType>
-                <xsd:sequence>
-                    <xsd:choice maxOccurs="unbounded">
-                        <xsd:element ref="beans:bean">
-                            <xsd:annotation>
-                                <xsd:documentation><![CDATA[
+				</xsd:annotation>
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:choice maxOccurs="unbounded">
+							<xsd:element ref="beans:bean">
+								<xsd:annotation>
+									<xsd:documentation><![CDATA[
 	A TransportHandler bean definition.
                         ]]></xsd:documentation>
-                            </xsd:annotation>
-                        </xsd:element>
-                        <xsd:element ref="beans:ref">
-                            <xsd:annotation>
-                                <xsd:documentation><![CDATA[
+								</xsd:annotation>
+							</xsd:element>
+							<xsd:element ref="beans:ref">
+								<xsd:annotation>
+									<xsd:documentation><![CDATA[
 	A reference to a TransportHandler bean.
                         ]]></xsd:documentation>
-                            </xsd:annotation>
-                        </xsd:element>
-                    </xsd:choice>
-                </xsd:sequence>
-                <xsd:attribute name="register-defaults" type="xsd:boolean" default="true">
-                    <xsd:annotation>
-                        <xsd:documentation><![CDATA[
+								</xsd:annotation>
+							</xsd:element>
+						</xsd:choice>
+					</xsd:sequence>
+					<xsd:attribute name="register-defaults" type="xsd:boolean" default="true">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
 	Whether or not default TransportHandlers registrations should be added in addition to the ones provided within this element.
 	Default registrations include XhrPollingTransportHandler, XhrReceivingTransportHandler,
 	JsonpPollingTransportHandler, JsonpReceivingTransportHandler, XhrStreamingTransportHandler,
 	EventSourceTransportHandler, HtmlFileTransportHandler, and WebSocketTransportHandler.
                         ]]></xsd:documentation>
-                    </xsd:annotation>
-                </xsd:attribute>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="name" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
+						</xsd:annotation>
+					</xsd:attribute>
+				</xsd:complexType>
+			</xsd:element>
+		</xsd:sequence>
+		<xsd:attribute name="name" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
 	A unique name for the service, mainly for logging purposes.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="client-library-url" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="client-library-url" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
 	Transports with no native cross-domain communication (e.g. "eventsource",
 	"htmlfile") must get a simple page from the "foreign" domain in an invisible
 	iframe so that code in the iframe can run from  a domain local to the SockJS
@@ -161,73 +161,73 @@
 	above the SockJS mapping. In case of a prefix-based Servlet mapping one more
 	traversal may be needed.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="stream-bytes-limit" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="stream-bytes-limit" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
 	Minimum number of bytes that can be send over a single HTTP streaming request before it will be closed.
 	Defaults to 128K (i.e. 128 1024).
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="session-cookie-needed" type="xsd:boolean">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="session-cookie-needed" type="xsd:boolean">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
 	The "cookie_needed" value in the response from the SockJs "/info" endpoint.
 	This property indicates whether the use of a JSESSIONID cookie is required for the application to function correctly,
 	e.g. for load balancing or in Java Servlet containers for the use of an HTTP session.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="heartbeat-time" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="heartbeat-time" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
 	The amount of time in milliseconds when the server has not sent any messages and after which the server
 	should send a heartbeat frame to the client in order to keep the connection from breaking.
 	The default value is 25,000 (25 seconds).
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="disconnect-delay" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="disconnect-delay" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
 	The amount of time in milliseconds before a client is considered disconnected after not having
 	a receiving connection, i.e. an active connection over which the server can send data to the client.
 	The default value is 5000.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="message-cache-size" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="message-cache-size" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
 	The number of server-to-client messages that a session can cache while waiting for
 	the next HTTP polling request from the client.
 	The default size is 100.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="websocket-enabled" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="websocket-enabled" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
 	Some load balancers don't support websockets. Set this option to "false" to disable the WebSocket transport on the server side.
 	The default value is "true".
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="scheduler" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="scheduler" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
 	The bean name of a TaskScheduler; a new ThreadPoolTaskScheduler instance will be created if no value is provided.
 	This scheduler instance will be used for scheduling heart-beat messages.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-    </xsd:complexType>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
 
-    <xsd:complexType name="stomp-broker-relay">
-        <xsd:annotation>
-            <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+	<xsd:complexType name="stomp-broker-relay">
+		<xsd:annotation>
+			<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	Configures a MessageHandler that handles messages by forwarding them to a STOMP broker.
 	This MessageHandler also opens a default "system" TCP connection to the message
 	broker that is used for sending messages that originate from the server application (as
@@ -235,132 +235,132 @@
 	The "login", "password", "heartbeat-send-interval" and "heartbeat-receive-interval" attributes
 	are provided to configure this "system" connection.
                 ]]></xsd:documentation>
-        </xsd:annotation>
-        <xsd:attribute name="prefix" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+		</xsd:annotation>
+		<xsd:attribute name="prefix" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	Comma-separated list of destination prefixes supported by the broker being configured.
 	Destinations that do not match the given prefix(es) are ignored.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="relay-host" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="relay-host" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	The STOMP message broker host.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="relay-port" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="relay-port" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	The STOMP message broker port.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="client-login" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="client-login" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	The login to use when creating connections to the STOMP broker on behalf of connected clients.
 	By default this is set to "guest".
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="client-passcode" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="client-passcode" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	The passcode to use when creating connections to the STOMP broker on behalf of connected clients.
 	By default this is set to "guest".
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="system-login" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="system-login" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	The login for the shared "system" connection used to send messages to
 	the STOMP broker from within the application, i.e. messages not associated
 	with a specific client session (e.g. REST/HTTP request handling method).
 	By default this is set to "guest".
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="system-passcode" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="system-passcode" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	The passcode for the shared "system" connection used to send messages to
 	the STOMP broker from within the application, i.e. messages not associated
 	with a specific client session (e.g. REST/HTTP request handling method).
 	By default this is set to "guest".
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="heartbeat-send-interval" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="heartbeat-send-interval" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	The interval, in milliseconds, at which the "system" connection will send heartbeats to the STOMP broker.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="heartbeat-receive-interval" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="heartbeat-receive-interval" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	The interval, in milliseconds, at which the "system" connection expects to receive heartbeats from the STOMP broker.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="auto-startup" type="xsd:boolean">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="auto-startup" type="xsd:boolean">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	Whether or not the StompBrokerRelay should be automatically started as part of its SmartLifecycle,
 	i.e. at the time of an application context refresh.
 	Default value is "true".
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="virtual-host" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="virtual-host" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	The value of the "host" header to use in STOMP CONNECT frames sent to the STOMP broker.
 	This may be useful for example in a cloud environment where the actual host to which
 	the TCP connection is established is different from the host providing the cloud-based STOMP service.
 	By default this property is not set.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-    </xsd:complexType>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
 
-    <xsd:complexType name="simple-broker">
-        <xsd:annotation>
-            <xsd:documentation source="java:org.springframework.messaging.simp.broker.SimpleBrokerMessageHandler"><![CDATA[
+	<xsd:complexType name="simple-broker">
+		<xsd:annotation>
+			<xsd:documentation source="java:org.springframework.messaging.simp.broker.SimpleBrokerMessageHandler"><![CDATA[
 	Configures a SimpleBrokerMessageHandler that handles messages as a simple message broker implementation.
                 ]]></xsd:documentation>
-        </xsd:annotation>
-        <xsd:attribute name="prefix" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.SimpleBrokerMessageHandler"><![CDATA[
+		</xsd:annotation>
+		<xsd:attribute name="prefix" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.SimpleBrokerMessageHandler"><![CDATA[
 	Comma-separated list of destination prefixes supported by the broker being configured.
 	Destinations that do not match the given prefix(es) are ignored.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-    </xsd:complexType>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
 
-    <xsd:complexType name="channel">
-        <xsd:sequence>
-            <xsd:element name="executor" type="channel-executor" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="interceptors" type="channel-interceptors" minOccurs="0" maxOccurs="1"/>
-        </xsd:sequence>
-    </xsd:complexType>
+	<xsd:complexType name="channel">
+		<xsd:sequence>
+			<xsd:element name="executor" type="channel-executor" minOccurs="0" maxOccurs="1"/>
+			<xsd:element name="interceptors" type="channel-interceptors" minOccurs="0" maxOccurs="1"/>
+		</xsd:sequence>
+	</xsd:complexType>
 
-    <xsd:complexType name="channel-executor">
-        <xsd:annotation>
-            <xsd:documentation source="java:org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"><![CDATA[
+	<xsd:complexType name="channel-executor">
+		<xsd:annotation>
+			<xsd:documentation source="java:org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"><![CDATA[
 	Configuration for the ThreadPoolTaskExecutor that sends messages for the message channel.
                 ]]></xsd:documentation>
-        </xsd:annotation>
-        <xsd:attribute name="core-pool-size" type="xsd:string" use="optional">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"><![CDATA[
+		</xsd:annotation>
+		<xsd:attribute name="core-pool-size" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"><![CDATA[
 	Set the core pool size of the ThreadPoolExecutor.
 	NOTE: the core pool size is effectively the max pool size when an unbounded queue-capacity is configured (the default).
 	This is essentially the "Unbounded queues" strategy as explained in java.util.concurrent.ThreadPoolExecutor.
@@ -369,73 +369,73 @@
 	In an an application where tasks do not block frequently,
 	the number should be closer to or equal to the number of available CPUs/cores.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="max-pool-size" type="xsd:string" use="optional">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="max-pool-size" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"><![CDATA[
 	 Set the max pool size of the ThreadPoolExecutor.
 	 NOTE: when an unbounded queue-capacity is configured (the default), the max pool size is effectively ignored.
 	 See the "Unbounded queues" strategy in java.util.concurrent.ThreadPoolExecutor for more details.
 	 By default this is set to Integer.MAX_VALUE.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="keep-alive-seconds" type="xsd:string" use="optional">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="keep-alive-seconds" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"><![CDATA[
 	 Set the time limit for which threads may remain idle before being terminated.
 	 If there are more than the core number of threads currently in the pool, after waiting this amount of time without
 	 processing a task, excess threads will be terminated.  This overrides any value set in the constructor.
 	 By default this is set to 60.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="queue-capacity" type="xsd:string" use="optional">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="queue-capacity" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"><![CDATA[
 	 Set the queue capacity for the ThreadPoolExecutor.
 	 NOTE: when an unbounded queue-capacity is configured (the default) the core pool size is effectively the max pool size.
 	 This is essentially the "Unbounded queues" strategy as explained in java.util.concurrent.ThreadPoolExecutor.
 	 When this strategy is used, the max pool size is effectively ignored.
 	 By default this is set to Integer.MAX_VALUE.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-    </xsd:complexType>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
 
-    <xsd:complexType name="channel-interceptors">
-        <xsd:annotation>
-            <xsd:documentation source="java:org.springframework.messaging.support.ChannelInterceptor"><![CDATA[
+	<xsd:complexType name="channel-interceptors">
+		<xsd:annotation>
+			<xsd:documentation source="java:org.springframework.messaging.support.ChannelInterceptor"><![CDATA[
 	List of ChannelInterceptor beans to be used with this channel.
 	Empty by default.
                 ]]></xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:choice maxOccurs="unbounded">
-                <xsd:element ref="beans:bean">
-                    <xsd:annotation>
-                        <xsd:documentation><![CDATA[
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:choice maxOccurs="unbounded">
+				<xsd:element ref="beans:bean">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
 	A ChannelInterceptor bean definition.
                         ]]></xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-                <xsd:element ref="beans:ref">
-                    <xsd:annotation>
-                        <xsd:documentation><![CDATA[
+					</xsd:annotation>
+				</xsd:element>
+				<xsd:element ref="beans:ref">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
 	A reference to a ChannelInterceptor bean.
                         ]]></xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-            </xsd:choice>
-        </xsd:sequence>
-    </xsd:complexType>
+					</xsd:annotation>
+				</xsd:element>
+			</xsd:choice>
+		</xsd:sequence>
+	</xsd:complexType>
 
-    <!-- Elements definitions -->
+	<!-- Elements definitions -->
 
-    <xsd:element name="handlers">
-        <xsd:annotation>
-            <xsd:documentation><![CDATA[
+	<xsd:element name="handlers">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
 	Configures WebSocket support by registering a SimpleUrlHandlerMapping and mapping
 	paths to registered WebSocketHandlers.
 
@@ -449,28 +449,28 @@
 	See EnableWebSocket Javadoc for
 	information on code-based alternatives to enabling WebSocket support.
             ]]></xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="mapping" type="mapping" minOccurs="1" maxOccurs="unbounded"/>
-                <xsd:element name="handshake-handler" type="handshake-handler" minOccurs="0" maxOccurs="1"/>
-                <xsd:element name="handshake-interceptors" type="handshake-interceptors" minOccurs="0" maxOccurs="1"/>
-                <xsd:element name="sockjs" type="sockjs-service" minOccurs="0" maxOccurs="1"/>
-            </xsd:sequence>
-            <xsd:attribute name="order" type="xsd:token">
-                <xsd:annotation>
-                    <xsd:documentation><![CDATA[
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="mapping" type="mapping" minOccurs="1" maxOccurs="unbounded"/>
+				<xsd:element name="handshake-handler" type="handshake-handler" minOccurs="0" maxOccurs="1"/>
+				<xsd:element name="handshake-interceptors" type="handshake-interceptors" minOccurs="0" maxOccurs="1"/>
+				<xsd:element name="sockjs" type="sockjs-service" minOccurs="0" maxOccurs="1"/>
+			</xsd:sequence>
+			<xsd:attribute name="order" type="xsd:token">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
 	Order value for this SimpleUrlHandlerMapping.
 	Default value is 1.
                 ]]></xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
-        </xsd:complexType>
-    </xsd:element>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
 
-    <xsd:element name="message-broker">
-        <xsd:annotation>
-            <xsd:documentation><![CDATA[
+	<xsd:element name="message-broker">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
 	Configures broker-backed messaging over WebSocket using a higher-level messaging sub-protocol.
 	Registers a SimpleUrlHandlerMapping and maps paths to registered Controllers.
 
@@ -478,19 +478,19 @@
 
 	See EnableWebSocketMessageBroker javadoc for information on code-based alternatives to enabling broker-backed messaging.
             ]]></xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="transport" minOccurs="0" maxOccurs="1">
-                    <xsd:annotation>
-                        <xsd:documentation><![CDATA[
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="transport" minOccurs="0" maxOccurs="1">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
 	Configure options related to the processing of messages received from and sent to WebSocket clients.
                         ]]></xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:complexType>
-                        <xsd:attribute name="message-size" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:documentation><![CDATA[
+					</xsd:annotation>
+					<xsd:complexType>
+						<xsd:attribute name="message-size" type="xsd:string">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
 	Configure the maximum size for an incoming sub-protocol message.
 	For example a STOMP message may be received as multiple WebSocket messages
 	or multiple HTTP POST requests when SockJS fallback options are in use.
@@ -509,11 +509,11 @@
 	Version 2 of the spec will but in the mean time existing client libraries
 	have already established a practice that servers must handle.
                                 ]]></xsd:documentation>
-                            </xsd:annotation>
-                        </xsd:attribute>
-                        <xsd:attribute name="send-timeout" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:documentation><![CDATA[
+							</xsd:annotation>
+						</xsd:attribute>
+						<xsd:attribute name="send-timeout" type="xsd:string">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
 	Configure a time limit (in milliseconds) for the maximum amount of a time
 	allowed when sending messages to a WebSocket session or writing to an
 	HTTP response when SockJS fallback option are in use.
@@ -544,11 +544,11 @@
 
 	The default value is 10 seconds (i.e. 10 * 10000).
                                 ]]></xsd:documentation>
-                            </xsd:annotation>
-                        </xsd:attribute>
-                        <xsd:attribute name="send-buffer-size" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:documentation><![CDATA[
+							</xsd:annotation>
+						</xsd:attribute>
+						<xsd:attribute name="send-buffer-size" type="xsd:string">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
 	Configure the maximum amount of data to buffer when sending messages
 	to a WebSocket session, or an HTTP response when SockJS fallback
 	option are in use.
@@ -576,97 +576,97 @@
 	sending messages; if the value is less than or equal to 0 then buffering
 	is effectively disabled.
                                 ]]></xsd:documentation>
-                            </xsd:annotation>
-                        </xsd:attribute>
-                    </xsd:complexType>
-                </xsd:element>
-                <xsd:element name="stomp-endpoint" minOccurs="1" maxOccurs="unbounded">
-                    <xsd:annotation>
-                        <xsd:documentation><![CDATA[
+							</xsd:annotation>
+						</xsd:attribute>
+					</xsd:complexType>
+				</xsd:element>
+				<xsd:element name="stomp-endpoint" minOccurs="1" maxOccurs="unbounded">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
 	Registers STOMP over WebSocket endpoints.
                         ]]></xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:complexType>
-                        <xsd:sequence>
-                            <xsd:element name="handshake-handler" type="handshake-handler" minOccurs="0" maxOccurs="1"/>
-                            <xsd:element name="sockjs" type="sockjs-service" minOccurs="0" maxOccurs="1"/>
-                        </xsd:sequence>
-                        <xsd:attribute name="path" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:documentation><![CDATA[
+					</xsd:annotation>
+					<xsd:complexType>
+						<xsd:sequence>
+							<xsd:element name="handshake-handler" type="handshake-handler" minOccurs="0" maxOccurs="1"/>
+							<xsd:element name="sockjs" type="sockjs-service" minOccurs="0" maxOccurs="1"/>
+						</xsd:sequence>
+						<xsd:attribute name="path" type="xsd:string">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
 	A path that maps a particular message destination to a handler method.
 	Exact path mapping URIs (such as "/myPath") are supported as well as Ant-stype path patterns (such as /myPath/**).
                 				]]></xsd:documentation>
-                            </xsd:annotation>
-                        </xsd:attribute>
-                    </xsd:complexType>
-                </xsd:element>
-                <xsd:choice>
-                    <xsd:element name="simple-broker" type="simple-broker"/>
-                    <xsd:element name="stomp-broker-relay" type="stomp-broker-relay"/>
-                </xsd:choice>
-                <xsd:element name="message-converters" minOccurs="0">
-                    <xsd:annotation>
-                        <xsd:documentation><![CDATA[
+							</xsd:annotation>
+						</xsd:attribute>
+					</xsd:complexType>
+				</xsd:element>
+				<xsd:choice>
+					<xsd:element name="simple-broker" type="simple-broker"/>
+					<xsd:element name="stomp-broker-relay" type="stomp-broker-relay"/>
+				</xsd:choice>
+				<xsd:element name="message-converters" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
 	Configure the message converters to use when extracting the payload of messages in annotated methods
 	and when sending messages (e.g. through the "broker" SimpMessagingTemplate.
 	MessageConverter registrations provided here will take precedence over MessageConverter types registered by default.
 	Also see the register-defaults attribute if you want to turn off default registrations entirely.
 						]]></xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:complexType>
-                        <xsd:sequence>
-                            <xsd:choice maxOccurs="unbounded">
-                                <xsd:element ref="beans:bean">
-                                    <xsd:annotation>
-                                        <xsd:documentation><![CDATA[
+					</xsd:annotation>
+					<xsd:complexType>
+						<xsd:sequence>
+							<xsd:choice maxOccurs="unbounded">
+								<xsd:element ref="beans:bean">
+									<xsd:annotation>
+										<xsd:documentation><![CDATA[
 	A MessageConverter bean definition.
 										]]></xsd:documentation>
-                                    </xsd:annotation>
-                                </xsd:element>
-                                <xsd:element ref="beans:ref">
-                                    <xsd:annotation>
-                                        <xsd:documentation><![CDATA[
+									</xsd:annotation>
+								</xsd:element>
+								<xsd:element ref="beans:ref">
+									<xsd:annotation>
+										<xsd:documentation><![CDATA[
 	A reference to an HttpMessageConverter bean.
 										]]></xsd:documentation>
-                                    </xsd:annotation>
-                                </xsd:element>
-                            </xsd:choice>
-                        </xsd:sequence>
-                        <xsd:attribute name="register-defaults" type="xsd:boolean" default="true">
-                            <xsd:annotation>
-                                <xsd:documentation><![CDATA[
+									</xsd:annotation>
+								</xsd:element>
+							</xsd:choice>
+						</xsd:sequence>
+						<xsd:attribute name="register-defaults" type="xsd:boolean" default="true">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
 	Whether or not default MessageConverter registrations should be added in addition to the ones provided within this element.
 								]]></xsd:documentation>
-                            </xsd:annotation>
-                        </xsd:attribute>
-                    </xsd:complexType>
-                </xsd:element>
-                <xsd:element name="client-inbound-channel" type="channel" minOccurs="0" maxOccurs="1">
-                    <xsd:annotation>
-                        <xsd:documentation><![CDATA[
+							</xsd:annotation>
+						</xsd:attribute>
+					</xsd:complexType>
+				</xsd:element>
+				<xsd:element name="client-inbound-channel" type="channel" minOccurs="0" maxOccurs="1">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
 	The channel for receiving messages from clients (e.g. WebSocket clients).
                 ]]></xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-                <xsd:element name="client-outbound-channel" type="channel" minOccurs="0" maxOccurs="1">
-                    <xsd:annotation>
-                        <xsd:documentation><![CDATA[
+					</xsd:annotation>
+				</xsd:element>
+				<xsd:element name="client-outbound-channel" type="channel" minOccurs="0" maxOccurs="1">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
 	The channel for sending messages to clients (e.g. WebSocket clients).
                 ]]></xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-                <xsd:element name="broker-channel" type="channel" minOccurs="0" maxOccurs="1">
-                    <xsd:annotation>
-                        <xsd:documentation><![CDATA[
+					</xsd:annotation>
+				</xsd:element>
+				<xsd:element name="broker-channel" type="channel" minOccurs="0" maxOccurs="1">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
 	The channel for sending messages with translated user destinations.
                 ]]></xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-            </xsd:sequence>
-            <xsd:attribute name="application-destination-prefix" type="xsd:string">
-                <xsd:annotation>
-                    <xsd:documentation><![CDATA[
+					</xsd:annotation>
+				</xsd:element>
+			</xsd:sequence>
+			<xsd:attribute name="application-destination-prefix" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
 	Comma-separated list of prefixes to match to the destinations of handled messages.
 	Messages whose destination does not start with one of the configured prefixes are ignored.
 
@@ -676,25 +676,25 @@
 	Prefixes without a trailing slash will have one appended automatically.
 	By default the list of prefixes is empty in which case all destinations match.
                     ]]></xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
-            <xsd:attribute name="user-destination-prefix" type="xsd:string">
-                <xsd:annotation>
-                    <xsd:documentation><![CDATA[
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="user-destination-prefix" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
 	The prefix used to identify user destinations.
 	Any destinations that do not start with the given prefix are not be resolved.
 	The default value is "/user/".
                     ]]></xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
-            <xsd:attribute name="order" type="xsd:token">
-                <xsd:annotation>
-                    <xsd:documentation><![CDATA[
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="order" type="xsd:token">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
 	Order value for this SimpleUrlHandlerMapping.
 	Default value is 1.
                 ]]></xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
-        </xsd:complexType>
-    </xsd:element>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
 </xsd:schema>
diff --git a/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.1.xsd b/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.1.xsd
index 43bce0b891a..71a1f76b24a 100644
--- a/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.1.xsd
+++ b/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.1.xsd
@@ -17,134 +17,134 @@
   -->
 
 <xsd:schema xmlns="http://www.springframework.org/schema/websocket"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:beans="http://www.springframework.org/schema/beans"
+			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+			xmlns:beans="http://www.springframework.org/schema/beans"
 			xmlns:tool="http://www.springframework.org/schema/tool"
-            targetNamespace="http://www.springframework.org/schema/websocket"
-            elementFormDefault="qualified"
-            attributeFormDefault="unqualified">
+			targetNamespace="http://www.springframework.org/schema/websocket"
+			elementFormDefault="qualified"
+			attributeFormDefault="unqualified">
 
-    <xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-4.1.xsd"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-4.1.xsd" />
+	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool.xsd" />
 
-    <xsd:complexType name="mapping">
-        <xsd:annotation>
-            <xsd:documentation><![CDATA[
+	<xsd:complexType name="mapping">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
 	An entry in the registered HandlerMapping that matches a path with a handler.
             ]]></xsd:documentation>
-        </xsd:annotation>
-        <xsd:attribute name="path" type="xsd:string" use="required">
-            <xsd:annotation>
-                <xsd:documentation><![CDATA[
+		</xsd:annotation>
+		<xsd:attribute name="path" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
 	A path that maps a particular request to a handler.
 	Exact path mapping URIs (such as "/myPath") are supported as well as Ant-stype path patterns (such as /myPath/**).
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="handler" type="xsd:string" use="required">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.web.socket.WebSocketHandler"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="handler" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.web.socket.WebSocketHandler"><![CDATA[
     The bean name of a WebSocketHandler to use for requests that match the path configuration.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-    </xsd:complexType>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
 
-    <xsd:complexType name="handshake-handler">
-        <xsd:attribute name="ref" type="xsd:string" use="required">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.web.socket.server.HandshakeHandler"><![CDATA[
+	<xsd:complexType name="handshake-handler">
+		<xsd:attribute name="ref" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.web.socket.server.HandshakeHandler"><![CDATA[
     The bean name of a HandshakeHandler to use for processing WebSocket handshake requests.
     If none specified, a DefaultHandshakeHandler will be configured by default.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-    </xsd:complexType>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
 
-    <xsd:complexType name="handshake-interceptors">
-        <xsd:annotation>
-            <xsd:documentation source="org.springframework.web.socket.server.HandshakeInterceptor"><![CDATA[
+	<xsd:complexType name="handshake-interceptors">
+		<xsd:annotation>
+			<xsd:documentation source="org.springframework.web.socket.server.HandshakeInterceptor"><![CDATA[
 	A list of HandshakeInterceptor beans definition and references.
 	A HandshakeInterceptor can be used to inspect the handshake request and response as well as to pass attributes to the target WebSocketHandler.
 			]]></xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:choice maxOccurs="unbounded">
-                <xsd:element ref="beans:bean">
-                    <xsd:annotation>
-                        <xsd:documentation source="org.springframework.web.socket.server.HandshakeInterceptor"><![CDATA[
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:choice maxOccurs="unbounded">
+				<xsd:element ref="beans:bean">
+					<xsd:annotation>
+						<xsd:documentation source="org.springframework.web.socket.server.HandshakeInterceptor"><![CDATA[
 	A HandshakeInterceptor bean definition.
                         ]]></xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-                <xsd:element ref="beans:ref">
-                    <xsd:annotation>
-                        <xsd:documentation source="org.springframework.web.socket.server.HandshakeInterceptor"><![CDATA[
+					</xsd:annotation>
+				</xsd:element>
+				<xsd:element ref="beans:ref">
+					<xsd:annotation>
+						<xsd:documentation source="org.springframework.web.socket.server.HandshakeInterceptor"><![CDATA[
 	A reference to a HandshakeInterceptor bean.
                     ]]></xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-            </xsd:choice>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="sockjs-service">
-        <xsd:annotation>
-            <xsd:documentation source="org.springframework.web.socket.sockjs.transport.handler.DefaultSockJsService"><![CDATA[
+					</xsd:annotation>
+				</xsd:element>
+			</xsd:choice>
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType name="sockjs-service">
+		<xsd:annotation>
+			<xsd:documentation source="org.springframework.web.socket.sockjs.transport.handler.DefaultSockJsService"><![CDATA[
 	Configures a DefaultSockJsService for processing HTTP requests from SockJS clients.
             ]]></xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:element name="transport-handlers" minOccurs="0" maxOccurs="1">
-                <xsd:annotation>
-                    <xsd:documentation source="org.springframework.web.socket.sockjs.transport.TransportHandler"><![CDATA[
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="transport-handlers" minOccurs="0" maxOccurs="1">
+				<xsd:annotation>
+					<xsd:documentation source="org.springframework.web.socket.sockjs.transport.TransportHandler"><![CDATA[
 	List of TransportHandler beans to be configured for the current handlers element.
 	One can choose not to register the default TransportHandlers and/or override those using
 	custom TransportHandlers.
                 ]]></xsd:documentation>
-                </xsd:annotation>
-                <xsd:complexType>
-                <xsd:sequence>
-                    <xsd:choice maxOccurs="unbounded">
-                        <xsd:element ref="beans:bean">
-                            <xsd:annotation>
-                                <xsd:documentation><![CDATA[
+				</xsd:annotation>
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:choice maxOccurs="unbounded">
+							<xsd:element ref="beans:bean">
+								<xsd:annotation>
+									<xsd:documentation><![CDATA[
 	A TransportHandler bean definition.
                         ]]></xsd:documentation>
-                            </xsd:annotation>
-                        </xsd:element>
-                        <xsd:element ref="beans:ref">
-                            <xsd:annotation>
-                                <xsd:documentation><![CDATA[
+								</xsd:annotation>
+							</xsd:element>
+							<xsd:element ref="beans:ref">
+								<xsd:annotation>
+									<xsd:documentation><![CDATA[
 	A reference to a TransportHandler bean.
                         ]]></xsd:documentation>
-                            </xsd:annotation>
-                        </xsd:element>
-                    </xsd:choice>
-                </xsd:sequence>
-                <xsd:attribute name="register-defaults" type="xsd:boolean" default="true">
-                    <xsd:annotation>
-                        <xsd:documentation><![CDATA[
+								</xsd:annotation>
+							</xsd:element>
+						</xsd:choice>
+					</xsd:sequence>
+					<xsd:attribute name="register-defaults" type="xsd:boolean" default="true">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
 	Whether or not default TransportHandlers registrations should be added in addition to the ones provided within this element.
 	Default registrations include XhrPollingTransportHandler, XhrReceivingTransportHandler,
 	JsonpPollingTransportHandler, JsonpReceivingTransportHandler, XhrStreamingTransportHandler,
 	EventSourceTransportHandler, HtmlFileTransportHandler, and WebSocketTransportHandler.
                         ]]></xsd:documentation>
-                    </xsd:annotation>
-                </xsd:attribute>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="name" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
+						</xsd:annotation>
+					</xsd:attribute>
+				</xsd:complexType>
+			</xsd:element>
+		</xsd:sequence>
+		<xsd:attribute name="name" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
 	A unique name for the service, mainly for logging purposes.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="client-library-url" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="client-library-url" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
 	Transports with no native cross-domain communication (e.g. "eventsource",
 	"htmlfile") must get a simple page from the "foreign" domain in an invisible
 	iframe so that code in the iframe can run from  a domain local to the SockJS
@@ -162,73 +162,73 @@
 	above the SockJS mapping. In case of a prefix-based Servlet mapping one more
 	traversal may be needed.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="stream-bytes-limit" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="stream-bytes-limit" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
 	Minimum number of bytes that can be send over a single HTTP streaming request before it will be closed.
 	Defaults to 128K (i.e. 128 1024).
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="session-cookie-needed" type="xsd:boolean">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="session-cookie-needed" type="xsd:boolean">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
 	The "cookie_needed" value in the response from the SockJs "/info" endpoint.
 	This property indicates whether the use of a JSESSIONID cookie is required for the application to function correctly,
 	e.g. for load balancing or in Java Servlet containers for the use of an HTTP session.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="heartbeat-time" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="heartbeat-time" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
 	The amount of time in milliseconds when the server has not sent any messages and after which the server
 	should send a heartbeat frame to the client in order to keep the connection from breaking.
 	The default value is 25,000 (25 seconds).
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="disconnect-delay" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="disconnect-delay" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
 	The amount of time in milliseconds before a client is considered disconnected after not having
 	a receiving connection, i.e. an active connection over which the server can send data to the client.
 	The default value is 5000.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="message-cache-size" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="message-cache-size" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
 	The number of server-to-client messages that a session can cache while waiting for
 	the next HTTP polling request from the client.
 	The default size is 100.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="websocket-enabled" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="websocket-enabled" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
 	Some load balancers don't support websockets. Set this option to "false" to disable the WebSocket transport on the server side.
 	The default value is "true".
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="scheduler" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="scheduler" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
 	The bean name of a TaskScheduler; a new ThreadPoolTaskScheduler instance will be created if no value is provided.
 	This scheduler instance will be used for scheduling heart-beat messages.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-    </xsd:complexType>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
 
-    <xsd:complexType name="stomp-broker-relay">
-        <xsd:annotation>
-            <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+	<xsd:complexType name="stomp-broker-relay">
+		<xsd:annotation>
+			<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	Configures a MessageHandler that handles messages by forwarding them to a STOMP broker.
 	This MessageHandler also opens a default "system" TCP connection to the message
 	broker that is used for sending messages that originate from the server application (as
@@ -236,132 +236,132 @@
 	The "login", "password", "heartbeat-send-interval" and "heartbeat-receive-interval" attributes
 	are provided to configure this "system" connection.
                 ]]></xsd:documentation>
-        </xsd:annotation>
-        <xsd:attribute name="prefix" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+		</xsd:annotation>
+		<xsd:attribute name="prefix" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	Comma-separated list of destination prefixes supported by the broker being configured.
 	Destinations that do not match the given prefix(es) are ignored.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="relay-host" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="relay-host" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	The STOMP message broker host.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="relay-port" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="relay-port" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	The STOMP message broker port.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="client-login" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="client-login" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	The login to use when creating connections to the STOMP broker on behalf of connected clients.
 	By default this is set to "guest".
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="client-passcode" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="client-passcode" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	The passcode to use when creating connections to the STOMP broker on behalf of connected clients.
 	By default this is set to "guest".
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="system-login" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="system-login" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	The login for the shared "system" connection used to send messages to
 	the STOMP broker from within the application, i.e. messages not associated
 	with a specific client session (e.g. REST/HTTP request handling method).
 	By default this is set to "guest".
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="system-passcode" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="system-passcode" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	The passcode for the shared "system" connection used to send messages to
 	the STOMP broker from within the application, i.e. messages not associated
 	with a specific client session (e.g. REST/HTTP request handling method).
 	By default this is set to "guest".
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="heartbeat-send-interval" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="heartbeat-send-interval" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	The interval, in milliseconds, at which the "system" connection will send heartbeats to the STOMP broker.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="heartbeat-receive-interval" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="heartbeat-receive-interval" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	The interval, in milliseconds, at which the "system" connection expects to receive heartbeats from the STOMP broker.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="auto-startup" type="xsd:boolean">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="auto-startup" type="xsd:boolean">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	Whether or not the StompBrokerRelay should be automatically started as part of its SmartLifecycle,
 	i.e. at the time of an application context refresh.
 	Default value is "true".
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="virtual-host" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="virtual-host" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	The value of the "host" header to use in STOMP CONNECT frames sent to the STOMP broker.
 	This may be useful for example in a cloud environment where the actual host to which
 	the TCP connection is established is different from the host providing the cloud-based STOMP service.
 	By default this property is not set.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-    </xsd:complexType>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
 
-    <xsd:complexType name="simple-broker">
-        <xsd:annotation>
-            <xsd:documentation source="java:org.springframework.messaging.simp.broker.SimpleBrokerMessageHandler"><![CDATA[
+	<xsd:complexType name="simple-broker">
+		<xsd:annotation>
+			<xsd:documentation source="java:org.springframework.messaging.simp.broker.SimpleBrokerMessageHandler"><![CDATA[
 	Configures a SimpleBrokerMessageHandler that handles messages as a simple message broker implementation.
                 ]]></xsd:documentation>
-        </xsd:annotation>
-        <xsd:attribute name="prefix" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.messaging.simp.stomp.SimpleBrokerMessageHandler"><![CDATA[
+		</xsd:annotation>
+		<xsd:attribute name="prefix" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.SimpleBrokerMessageHandler"><![CDATA[
 	Comma-separated list of destination prefixes supported by the broker being configured.
 	Destinations that do not match the given prefix(es) are ignored.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-    </xsd:complexType>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
 
-    <xsd:complexType name="channel">
-        <xsd:sequence>
-            <xsd:element name="executor" type="channel-executor" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="interceptors" type="channel-interceptors" minOccurs="0" maxOccurs="1"/>
-        </xsd:sequence>
-    </xsd:complexType>
+	<xsd:complexType name="channel">
+		<xsd:sequence>
+			<xsd:element name="executor" type="channel-executor" minOccurs="0" maxOccurs="1"/>
+			<xsd:element name="interceptors" type="channel-interceptors" minOccurs="0" maxOccurs="1"/>
+		</xsd:sequence>
+	</xsd:complexType>
 
-    <xsd:complexType name="channel-executor">
-        <xsd:annotation>
-            <xsd:documentation source="java:org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"><![CDATA[
+	<xsd:complexType name="channel-executor">
+		<xsd:annotation>
+			<xsd:documentation source="java:org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"><![CDATA[
 	Configuration for the ThreadPoolTaskExecutor that sends messages for the message channel.
                 ]]></xsd:documentation>
-        </xsd:annotation>
-        <xsd:attribute name="core-pool-size" type="xsd:string" use="optional">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"><![CDATA[
+		</xsd:annotation>
+		<xsd:attribute name="core-pool-size" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"><![CDATA[
 	Set the core pool size of the ThreadPoolExecutor.
 	NOTE: the core pool size is effectively the max pool size when an unbounded queue-capacity is configured (the default).
 	This is essentially the "Unbounded queues" strategy as explained in java.util.concurrent.ThreadPoolExecutor.
@@ -370,73 +370,73 @@
 	In an an application where tasks do not block frequently,
 	the number should be closer to or equal to the number of available CPUs/cores.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="max-pool-size" type="xsd:string" use="optional">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="max-pool-size" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"><![CDATA[
 	 Set the max pool size of the ThreadPoolExecutor.
 	 NOTE: when an unbounded queue-capacity is configured (the default), the max pool size is effectively ignored.
 	 See the "Unbounded queues" strategy in java.util.concurrent.ThreadPoolExecutor for more details.
 	 By default this is set to Integer.MAX_VALUE.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="keep-alive-seconds" type="xsd:string" use="optional">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="keep-alive-seconds" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"><![CDATA[
 	 Set the time limit for which threads may remain idle before being terminated.
 	 If there are more than the core number of threads currently in the pool, after waiting this amount of time without
 	 processing a task, excess threads will be terminated.  This overrides any value set in the constructor.
 	 By default this is set to 60.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="queue-capacity" type="xsd:string" use="optional">
-            <xsd:annotation>
-                <xsd:documentation source="java:org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"><![CDATA[
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="queue-capacity" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"><![CDATA[
 	 Set the queue capacity for the ThreadPoolExecutor.
 	 NOTE: when an unbounded queue-capacity is configured (the default) the core pool size is effectively the max pool size.
 	 This is essentially the "Unbounded queues" strategy as explained in java.util.concurrent.ThreadPoolExecutor.
 	 When this strategy is used, the max pool size is effectively ignored.
 	 By default this is set to Integer.MAX_VALUE.
                 ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-    </xsd:complexType>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
 
-    <xsd:complexType name="channel-interceptors">
-        <xsd:annotation>
-            <xsd:documentation source="java:org.springframework.messaging.support.ChannelInterceptor"><![CDATA[
+	<xsd:complexType name="channel-interceptors">
+		<xsd:annotation>
+			<xsd:documentation source="java:org.springframework.messaging.support.ChannelInterceptor"><![CDATA[
 	List of ChannelInterceptor beans to be used with this channel.
 	Empty by default.
                 ]]></xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:choice maxOccurs="unbounded">
-                <xsd:element ref="beans:bean">
-                    <xsd:annotation>
-                        <xsd:documentation><![CDATA[
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:choice maxOccurs="unbounded">
+				<xsd:element ref="beans:bean">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
 	A ChannelInterceptor bean definition.
                         ]]></xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-                <xsd:element ref="beans:ref">
-                    <xsd:annotation>
-                        <xsd:documentation><![CDATA[
+					</xsd:annotation>
+				</xsd:element>
+				<xsd:element ref="beans:ref">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
 	A reference to a ChannelInterceptor bean.
                         ]]></xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-            </xsd:choice>
-        </xsd:sequence>
-    </xsd:complexType>
+					</xsd:annotation>
+				</xsd:element>
+			</xsd:choice>
+		</xsd:sequence>
+	</xsd:complexType>
 
-    <!-- Elements definitions -->
+	<!-- Elements definitions -->
 
-    <xsd:element name="handlers">
-        <xsd:annotation>
-            <xsd:documentation><![CDATA[
+	<xsd:element name="handlers">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
 	Configures WebSocket support by registering a SimpleUrlHandlerMapping and mapping
 	paths to registered WebSocketHandlers.
 
@@ -450,28 +450,28 @@
 	See EnableWebSocket Javadoc for
 	information on code-based alternatives to enabling WebSocket support.
             ]]></xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="mapping" type="mapping" minOccurs="1" maxOccurs="unbounded"/>
-                <xsd:element name="handshake-handler" type="handshake-handler" minOccurs="0" maxOccurs="1"/>
-                <xsd:element name="handshake-interceptors" type="handshake-interceptors" minOccurs="0" maxOccurs="1"/>
-                <xsd:element name="sockjs" type="sockjs-service" minOccurs="0" maxOccurs="1"/>
-            </xsd:sequence>
-            <xsd:attribute name="order" type="xsd:token">
-                <xsd:annotation>
-                    <xsd:documentation><![CDATA[
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="mapping" type="mapping" minOccurs="1" maxOccurs="unbounded"/>
+				<xsd:element name="handshake-handler" type="handshake-handler" minOccurs="0" maxOccurs="1"/>
+				<xsd:element name="handshake-interceptors" type="handshake-interceptors" minOccurs="0" maxOccurs="1"/>
+				<xsd:element name="sockjs" type="sockjs-service" minOccurs="0" maxOccurs="1"/>
+			</xsd:sequence>
+			<xsd:attribute name="order" type="xsd:token">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
 	Order value for this SimpleUrlHandlerMapping.
 	Default value is 1.
                 ]]></xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
-        </xsd:complexType>
-    </xsd:element>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
 
-    <xsd:element name="message-broker">
-        <xsd:annotation>
-            <xsd:documentation><![CDATA[
+	<xsd:element name="message-broker">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
 	Configures broker-backed messaging over WebSocket using a higher-level messaging sub-protocol.
 	Registers a SimpleUrlHandlerMapping and maps paths to registered Controllers.
 
@@ -479,19 +479,19 @@
 
 	See EnableWebSocketMessageBroker javadoc for information on code-based alternatives to enabling broker-backed messaging.
             ]]></xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="transport" minOccurs="0" maxOccurs="1">
-                    <xsd:annotation>
-                        <xsd:documentation><![CDATA[
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="transport" minOccurs="0" maxOccurs="1">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
 	Configure options related to the processing of messages received from and sent to WebSocket clients.
                         ]]></xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:complexType>
-                        <xsd:attribute name="message-size" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:documentation><![CDATA[
+					</xsd:annotation>
+					<xsd:complexType>
+						<xsd:attribute name="message-size" type="xsd:string">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
 	Configure the maximum size for an incoming sub-protocol message.
 	For example a STOMP message may be received as multiple WebSocket messages
 	or multiple HTTP POST requests when SockJS fallback options are in use.
@@ -510,11 +510,11 @@
 	Version 2 of the spec will but in the mean time existing client libraries
 	have already established a practice that servers must handle.
                                 ]]></xsd:documentation>
-                            </xsd:annotation>
-                        </xsd:attribute>
-                        <xsd:attribute name="send-timeout" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:documentation><![CDATA[
+							</xsd:annotation>
+						</xsd:attribute>
+						<xsd:attribute name="send-timeout" type="xsd:string">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
 	Configure a time limit (in milliseconds) for the maximum amount of a time
 	allowed when sending messages to a WebSocket session or writing to an
 	HTTP response when SockJS fallback option are in use.
@@ -545,11 +545,11 @@
 
 	The default value is 10 seconds (i.e. 10 * 10000).
                                 ]]></xsd:documentation>
-                            </xsd:annotation>
-                        </xsd:attribute>
-                        <xsd:attribute name="send-buffer-size" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:documentation><![CDATA[
+							</xsd:annotation>
+						</xsd:attribute>
+						<xsd:attribute name="send-buffer-size" type="xsd:string">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
 	Configure the maximum amount of data to buffer when sending messages
 	to a WebSocket session, or an HTTP response when SockJS fallback
 	option are in use.
@@ -577,97 +577,97 @@
 	sending messages; if the value is less than or equal to 0 then buffering
 	is effectively disabled.
                                 ]]></xsd:documentation>
-                            </xsd:annotation>
-                        </xsd:attribute>
-                    </xsd:complexType>
-                </xsd:element>
-                <xsd:element name="stomp-endpoint" minOccurs="1" maxOccurs="unbounded">
-                    <xsd:annotation>
-                        <xsd:documentation><![CDATA[
+							</xsd:annotation>
+						</xsd:attribute>
+					</xsd:complexType>
+				</xsd:element>
+				<xsd:element name="stomp-endpoint" minOccurs="1" maxOccurs="unbounded">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
 	Registers STOMP over WebSocket endpoints.
                         ]]></xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:complexType>
-                        <xsd:sequence>
-                            <xsd:element name="handshake-handler" type="handshake-handler" minOccurs="0" maxOccurs="1"/>
-                            <xsd:element name="sockjs" type="sockjs-service" minOccurs="0" maxOccurs="1"/>
-                        </xsd:sequence>
-                        <xsd:attribute name="path" type="xsd:string">
-                            <xsd:annotation>
-                                <xsd:documentation><![CDATA[
+					</xsd:annotation>
+					<xsd:complexType>
+						<xsd:sequence>
+							<xsd:element name="handshake-handler" type="handshake-handler" minOccurs="0" maxOccurs="1"/>
+							<xsd:element name="sockjs" type="sockjs-service" minOccurs="0" maxOccurs="1"/>
+						</xsd:sequence>
+						<xsd:attribute name="path" type="xsd:string">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
 	A path that maps a particular message destination to a handler method.
 	Exact path mapping URIs (such as "/myPath") are supported as well as Ant-stype path patterns (such as /myPath/**).
                 				]]></xsd:documentation>
-                            </xsd:annotation>
-                        </xsd:attribute>
-                    </xsd:complexType>
-                </xsd:element>
-                <xsd:choice>
-                    <xsd:element name="simple-broker" type="simple-broker"/>
-                    <xsd:element name="stomp-broker-relay" type="stomp-broker-relay"/>
-                </xsd:choice>
-                <xsd:element name="message-converters" minOccurs="0">
-                    <xsd:annotation>
-                        <xsd:documentation><![CDATA[
+							</xsd:annotation>
+						</xsd:attribute>
+					</xsd:complexType>
+				</xsd:element>
+				<xsd:choice>
+					<xsd:element name="simple-broker" type="simple-broker"/>
+					<xsd:element name="stomp-broker-relay" type="stomp-broker-relay"/>
+				</xsd:choice>
+				<xsd:element name="message-converters" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
 	Configure the message converters to use when extracting the payload of messages in annotated methods
 	and when sending messages (e.g. through the "broker" SimpMessagingTemplate.
 	MessageConverter registrations provided here will take precedence over MessageConverter types registered by default.
 	Also see the register-defaults attribute if you want to turn off default registrations entirely.
 						]]></xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:complexType>
-                        <xsd:sequence>
-                            <xsd:choice maxOccurs="unbounded">
-                                <xsd:element ref="beans:bean">
-                                    <xsd:annotation>
-                                        <xsd:documentation><![CDATA[
+					</xsd:annotation>
+					<xsd:complexType>
+						<xsd:sequence>
+							<xsd:choice maxOccurs="unbounded">
+								<xsd:element ref="beans:bean">
+									<xsd:annotation>
+										<xsd:documentation><![CDATA[
 	A MessageConverter bean definition.
 										]]></xsd:documentation>
-                                    </xsd:annotation>
-                                </xsd:element>
-                                <xsd:element ref="beans:ref">
-                                    <xsd:annotation>
-                                        <xsd:documentation><![CDATA[
+									</xsd:annotation>
+								</xsd:element>
+								<xsd:element ref="beans:ref">
+									<xsd:annotation>
+										<xsd:documentation><![CDATA[
 	A reference to an HttpMessageConverter bean.
 										]]></xsd:documentation>
-                                    </xsd:annotation>
-                                </xsd:element>
-                            </xsd:choice>
-                        </xsd:sequence>
-                        <xsd:attribute name="register-defaults" type="xsd:boolean" default="true">
-                            <xsd:annotation>
-                                <xsd:documentation><![CDATA[
+									</xsd:annotation>
+								</xsd:element>
+							</xsd:choice>
+						</xsd:sequence>
+						<xsd:attribute name="register-defaults" type="xsd:boolean" default="true">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
 	Whether or not default MessageConverter registrations should be added in addition to the ones provided within this element.
 								]]></xsd:documentation>
-                            </xsd:annotation>
-                        </xsd:attribute>
-                    </xsd:complexType>
-                </xsd:element>
-                <xsd:element name="client-inbound-channel" type="channel" minOccurs="0" maxOccurs="1">
-                    <xsd:annotation>
-                        <xsd:documentation><![CDATA[
+							</xsd:annotation>
+						</xsd:attribute>
+					</xsd:complexType>
+				</xsd:element>
+				<xsd:element name="client-inbound-channel" type="channel" minOccurs="0" maxOccurs="1">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
 	The channel for receiving messages from clients (e.g. WebSocket clients).
                 ]]></xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-                <xsd:element name="client-outbound-channel" type="channel" minOccurs="0" maxOccurs="1">
-                    <xsd:annotation>
-                        <xsd:documentation><![CDATA[
+					</xsd:annotation>
+				</xsd:element>
+				<xsd:element name="client-outbound-channel" type="channel" minOccurs="0" maxOccurs="1">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
 	The channel for sending messages to clients (e.g. WebSocket clients).
                 ]]></xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-                <xsd:element name="broker-channel" type="channel" minOccurs="0" maxOccurs="1">
-                    <xsd:annotation>
-                        <xsd:documentation><![CDATA[
+					</xsd:annotation>
+				</xsd:element>
+				<xsd:element name="broker-channel" type="channel" minOccurs="0" maxOccurs="1">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
 	The channel for sending messages with translated user destinations.
                 ]]></xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-            </xsd:sequence>
-            <xsd:attribute name="application-destination-prefix" type="xsd:string">
-                <xsd:annotation>
-                    <xsd:documentation><![CDATA[
+					</xsd:annotation>
+				</xsd:element>
+			</xsd:sequence>
+			<xsd:attribute name="application-destination-prefix" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
 	Comma-separated list of prefixes to match to the destinations of handled messages.
 	Messages whose destination does not start with one of the configured prefixes are ignored.
 
@@ -677,17 +677,17 @@
 	Prefixes without a trailing slash will have one appended automatically.
 	By default the list of prefixes is empty in which case all destinations match.
                     ]]></xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
-            <xsd:attribute name="user-destination-prefix" type="xsd:string">
-                <xsd:annotation>
-                    <xsd:documentation><![CDATA[
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="user-destination-prefix" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
 	The prefix used to identify user destinations.
 	Any destinations that do not start with the given prefix are not be resolved.
 	The default value is "/user/".
                     ]]></xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
+				</xsd:annotation>
+			</xsd:attribute>
 			<xsd:attribute name="path-matcher" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
@@ -715,14 +715,14 @@
 					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:attribute>
-            <xsd:attribute name="order" type="xsd:token">
-                <xsd:annotation>
-                    <xsd:documentation><![CDATA[
+			<xsd:attribute name="order" type="xsd:token">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
 	Order value for this SimpleUrlHandlerMapping.
 	Default value is 1.
                 ]]></xsd:documentation>
-                </xsd:annotation>
-            </xsd:attribute>
-        </xsd:complexType>
-    </xsd:element>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
 </xsd:schema>
diff --git a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-converters-defaults-off.xml b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-converters-defaults-off.xml
index 8cc18e54007..0da56b8e128 100644
--- a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-converters-defaults-off.xml
+++ b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-converters-defaults-off.xml
@@ -1,19 +1,19 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:websocket="http://www.springframework.org/schema/websocket"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:websocket="http://www.springframework.org/schema/websocket"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd">
 
-    <websocket:message-broker>
+	<websocket:message-broker>
 
-        <websocket:stomp-endpoint path="/foo" />
+		<websocket:stomp-endpoint path="/foo" />
 
-        <websocket:simple-broker />
+		<websocket:simple-broker />
 
-        <websocket:message-converters register-defaults="false">
-            <bean class="org.springframework.messaging.converter.StringMessageConverter"/>
-        </websocket:message-converters>
+		<websocket:message-converters register-defaults="false">
+			<bean class="org.springframework.messaging.converter.StringMessageConverter"/>
+		</websocket:message-converters>
 
-    </websocket:message-broker>
+	</websocket:message-broker>
 
 </beans>
diff --git a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-converters.xml b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-converters.xml
index 86c0fbfba44..80a664ccc1b 100644
--- a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-converters.xml
+++ b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-converters.xml
@@ -1,19 +1,19 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:websocket="http://www.springframework.org/schema/websocket"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:websocket="http://www.springframework.org/schema/websocket"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd">
 
-    <websocket:message-broker>
+	<websocket:message-broker>
 
-        <websocket:stomp-endpoint path="/foo" />
+		<websocket:stomp-endpoint path="/foo" />
 
-        <websocket:simple-broker />
+		<websocket:simple-broker />
 
-        <websocket:message-converters>
-            <bean class="org.springframework.messaging.converter.StringMessageConverter"/>
-        </websocket:message-converters>
+		<websocket:message-converters>
+			<bean class="org.springframework.messaging.converter.StringMessageConverter"/>
+		</websocket:message-converters>
 
-    </websocket:message-broker>
+	</websocket:message-broker>
 
 </beans>
diff --git a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-customchannels-default-executor.xml b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-customchannels-default-executor.xml
index 1e68eccc812..ef38534a840 100644
--- a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-customchannels-default-executor.xml
+++ b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-customchannels-default-executor.xml
@@ -1,30 +1,30 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:websocket="http://www.springframework.org/schema/websocket"
-       xsi:schemaLocation="
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:websocket="http://www.springframework.org/schema/websocket"
+	   xsi:schemaLocation="
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd">
 
-    <websocket:message-broker>
-        <websocket:stomp-endpoint path="/foo"/>
-        <websocket:simple-broker prefix="/topic"/>
-        <websocket:client-inbound-channel>
-            <websocket:interceptors>
-                <ref bean="myInterceptor"/>
-            </websocket:interceptors>
-        </websocket:client-inbound-channel>
-        <websocket:client-outbound-channel>
-            <websocket:interceptors>
-                <ref bean="myInterceptor"/>
-            </websocket:interceptors>
-        </websocket:client-outbound-channel>
-        <websocket:broker-channel>
-            <websocket:interceptors>
-                <ref bean="myInterceptor"/>
-            </websocket:interceptors>
-        </websocket:broker-channel>
-    </websocket:message-broker>
+	<websocket:message-broker>
+		<websocket:stomp-endpoint path="/foo"/>
+		<websocket:simple-broker prefix="/topic"/>
+		<websocket:client-inbound-channel>
+			<websocket:interceptors>
+				<ref bean="myInterceptor"/>
+			</websocket:interceptors>
+		</websocket:client-inbound-channel>
+		<websocket:client-outbound-channel>
+			<websocket:interceptors>
+				<ref bean="myInterceptor"/>
+			</websocket:interceptors>
+		</websocket:client-outbound-channel>
+		<websocket:broker-channel>
+			<websocket:interceptors>
+				<ref bean="myInterceptor"/>
+			</websocket:interceptors>
+		</websocket:broker-channel>
+	</websocket:message-broker>
 
-    <bean id="myInterceptor" class="org.springframework.web.socket.config.TestChannelInterceptor"/>
+	<bean id="myInterceptor" class="org.springframework.web.socket.config.TestChannelInterceptor"/>
 
 </beans>
diff --git a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-customchannels.xml b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-customchannels.xml
index 2b07d476eab..e8908da1a17 100644
--- a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-customchannels.xml
+++ b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-customchannels.xml
@@ -1,34 +1,34 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:websocket="http://www.springframework.org/schema/websocket"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:websocket="http://www.springframework.org/schema/websocket"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd">
 
-    <websocket:message-broker application-destination-prefix="/app" user-destination-prefix="/personal">
-        <websocket:stomp-endpoint path="/foo,/bar">
-            <websocket:handshake-handler ref="myHandler"/>
-        </websocket:stomp-endpoint>
-        <websocket:simple-broker prefix="/topic"/>
-        <websocket:client-inbound-channel>
-            <websocket:executor core-pool-size="100" max-pool-size="200" keep-alive-seconds="600"/>
-            <websocket:interceptors>
-                <ref bean="myInterceptor"/>
-            </websocket:interceptors>
-        </websocket:client-inbound-channel>
-        <websocket:client-outbound-channel>
-            <websocket:executor core-pool-size="101" max-pool-size="201" keep-alive-seconds="601"/>
-            <websocket:interceptors>
-                <ref bean="myInterceptor"/>
-                <bean class="org.springframework.web.socket.config.TestChannelInterceptor"/>
-            </websocket:interceptors>
-        </websocket:client-outbound-channel>
-        <websocket:broker-channel>
-            <websocket:executor core-pool-size="102" max-pool-size="202" keep-alive-seconds="602"/>
-        </websocket:broker-channel>
-    </websocket:message-broker>
+	<websocket:message-broker application-destination-prefix="/app" user-destination-prefix="/personal">
+		<websocket:stomp-endpoint path="/foo,/bar">
+			<websocket:handshake-handler ref="myHandler"/>
+		</websocket:stomp-endpoint>
+		<websocket:simple-broker prefix="/topic"/>
+		<websocket:client-inbound-channel>
+			<websocket:executor core-pool-size="100" max-pool-size="200" keep-alive-seconds="600"/>
+			<websocket:interceptors>
+				<ref bean="myInterceptor"/>
+			</websocket:interceptors>
+		</websocket:client-inbound-channel>
+		<websocket:client-outbound-channel>
+			<websocket:executor core-pool-size="101" max-pool-size="201" keep-alive-seconds="601"/>
+			<websocket:interceptors>
+				<ref bean="myInterceptor"/>
+				<bean class="org.springframework.web.socket.config.TestChannelInterceptor"/>
+			</websocket:interceptors>
+		</websocket:client-outbound-channel>
+		<websocket:broker-channel>
+			<websocket:executor core-pool-size="102" max-pool-size="202" keep-alive-seconds="602"/>
+		</websocket:broker-channel>
+	</websocket:message-broker>
 
-    <bean id="myHandler" class="org.springframework.web.socket.config.TestHandshakeHandler"/>
+	<bean id="myHandler" class="org.springframework.web.socket.config.TestHandshakeHandler"/>
 
-    <bean id="myInterceptor" class="org.springframework.web.socket.config.TestChannelInterceptor"/>
+	<bean id="myInterceptor" class="org.springframework.web.socket.config.TestChannelInterceptor"/>
 
 </beans>
diff --git a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-relay.xml b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-relay.xml
index a7527ce43f8..eb3b9c4d6eb 100644
--- a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-relay.xml
+++ b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-relay.xml
@@ -1,20 +1,20 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:websocket="http://www.springframework.org/schema/websocket"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:websocket="http://www.springframework.org/schema/websocket"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd">
 
-    <websocket:message-broker order="2">
-        <websocket:stomp-endpoint path="/foo">
-            <websocket:sockjs/>
-        </websocket:stomp-endpoint>
-        <websocket:stomp-broker-relay prefix="/topic,/queue" relay-host="relayhost" relay-port="1234"
-                client-login="clientlogin" client-passcode="clientpass"
-                system-login="syslogin" system-passcode="syspass"
-                heartbeat-send-interval="5000" heartbeat-receive-interval="5000"
-                virtual-host="spring.io"/>
-    </websocket:message-broker>
+	<websocket:message-broker order="2">
+		<websocket:stomp-endpoint path="/foo">
+			<websocket:sockjs/>
+		</websocket:stomp-endpoint>
+		<websocket:stomp-broker-relay prefix="/topic,/queue" relay-host="relayhost" relay-port="1234"
+									  client-login="clientlogin" client-passcode="clientpass"
+									  system-login="syslogin" system-passcode="syspass"
+									  heartbeat-send-interval="5000" heartbeat-receive-interval="5000"
+									  virtual-host="spring.io"/>
+	</websocket:message-broker>
 
-    <bean id="myHandler" class="org.springframework.web.socket.config.TestWebSocketHandler"/>
+	<bean id="myHandler" class="org.springframework.web.socket.config.TestWebSocketHandler"/>
 
 </beans>
diff --git a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-simple.xml b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-simple.xml
index aa2acc0fa58..d89a7f42230 100644
--- a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-simple.xml
+++ b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-simple.xml
@@ -1,33 +1,33 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:websocket="http://www.springframework.org/schema/websocket"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:websocket="http://www.springframework.org/schema/websocket"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd">
 
-    <websocket:message-broker application-destination-prefix="/app"
+	<websocket:message-broker application-destination-prefix="/app"
 							  user-destination-prefix="/personal"
 							  path-matcher="pathMatcher">
 
-        <!-- message-size=128*1024, send-buffer-size=1024*1024 -->
-        <websocket:transport message-size="131072" send-timeout="25000" send-buffer-size="1048576" />
+		<!-- message-size=128*1024, send-buffer-size=1024*1024 -->
+		<websocket:transport message-size="131072" send-timeout="25000" send-buffer-size="1048576" />
 
-        <websocket:stomp-endpoint path=" /foo,/bar">
-            <websocket:handshake-handler ref="myHandler"/>
-        </websocket:stomp-endpoint>
+		<websocket:stomp-endpoint path=" /foo,/bar">
+			<websocket:handshake-handler ref="myHandler"/>
+		</websocket:stomp-endpoint>
 
-        <websocket:stomp-endpoint path="/test,/sockjs">
-            <websocket:handshake-handler ref="myHandler"/>
-            <websocket:sockjs/>
-        </websocket:stomp-endpoint>
+		<websocket:stomp-endpoint path="/test,/sockjs">
+			<websocket:handshake-handler ref="myHandler"/>
+			<websocket:sockjs/>
+		</websocket:stomp-endpoint>
 
-        <websocket:simple-broker prefix="/topic, /queue"/>
+		<websocket:simple-broker prefix="/topic, /queue"/>
 
-    </websocket:message-broker>
+	</websocket:message-broker>
 
 	<bean id="pathMatcher" class="org.springframework.util.AntPathMatcher">
 		<property name="pathSeparator" value="." />
 	</bean>
 
-    <bean id="myHandler" class="org.springframework.web.socket.config.TestHandshakeHandler"/>
+	<bean id="myHandler" class="org.springframework.web.socket.config.TestHandshakeHandler"/>
 
 </beans>
diff --git a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-attributes.xml b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-attributes.xml
index bbde4d4dce8..9cc65a3426a 100644
--- a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-attributes.xml
+++ b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-attributes.xml
@@ -1,24 +1,24 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:websocket="http://www.springframework.org/schema/websocket"
-       xsi:schemaLocation="
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:websocket="http://www.springframework.org/schema/websocket"
+	   xsi:schemaLocation="
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd">
 
-    <websocket:handlers order="2">
-        <websocket:mapping path="/foo" handler="fooHandler"/>
-        <websocket:mapping path="/test" handler="testHandler"/>
-        <websocket:handshake-handler ref="testHandshakeHandler"/>
-        <websocket:handshake-interceptors>
-            <bean class="org.springframework.web.socket.config.FooTestInterceptor"/>
-            <ref bean="barTestInterceptor"/>
-        </websocket:handshake-interceptors>
-    </websocket:handlers>
+	<websocket:handlers order="2">
+		<websocket:mapping path="/foo" handler="fooHandler"/>
+		<websocket:mapping path="/test" handler="testHandler"/>
+		<websocket:handshake-handler ref="testHandshakeHandler"/>
+		<websocket:handshake-interceptors>
+			<bean class="org.springframework.web.socket.config.FooTestInterceptor"/>
+			<ref bean="barTestInterceptor"/>
+		</websocket:handshake-interceptors>
+	</websocket:handlers>
 
-    <bean id="testHandler" class="org.springframework.web.socket.config.TestWebSocketHandler"/>
-    <bean id="fooHandler" class="org.springframework.web.socket.config.FooWebSocketHandler"/>
+	<bean id="testHandler" class="org.springframework.web.socket.config.TestWebSocketHandler"/>
+	<bean id="fooHandler" class="org.springframework.web.socket.config.FooWebSocketHandler"/>
 
-    <bean id="barTestInterceptor" class="org.springframework.web.socket.config.BarTestInterceptor"/>
-    <bean id="testHandshakeHandler" class="org.springframework.web.socket.config.TestHandshakeHandler"/>
+	<bean id="barTestInterceptor" class="org.springframework.web.socket.config.BarTestInterceptor"/>
+	<bean id="testHandshakeHandler" class="org.springframework.web.socket.config.TestHandshakeHandler"/>
 
 </beans>
diff --git a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-sockjs-attributes.xml b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-sockjs-attributes.xml
index f40e41f6708..8e7ab6cd45a 100644
--- a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-sockjs-attributes.xml
+++ b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-sockjs-attributes.xml
@@ -1,29 +1,29 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:websocket="http://www.springframework.org/schema/websocket"
-       xsi:schemaLocation="
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:websocket="http://www.springframework.org/schema/websocket"
+	   xsi:schemaLocation="
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd">
 
-    <websocket:handlers >
-        <websocket:mapping path="/test" handler="testHandler"/>
-        <websocket:sockjs name="testSockJsService" scheduler="testTaskScheduler" websocket-enabled="false"
-                session-cookie-needed="false" stream-bytes-limit="2048" disconnect-delay="256"
-                message-cache-size="1024" heartbeat-time="20">
-            <websocket:transport-handlers register-defaults="false">
-                <bean class="org.springframework.web.socket.sockjs.transport.handler.XhrPollingTransportHandler"/>
-                <ref bean="xhrStreamingTransportHandler"/>
-            </websocket:transport-handlers>
-        </websocket:sockjs>
-    </websocket:handlers>
+	<websocket:handlers >
+		<websocket:mapping path="/test" handler="testHandler"/>
+		<websocket:sockjs name="testSockJsService" scheduler="testTaskScheduler" websocket-enabled="false"
+						  session-cookie-needed="false" stream-bytes-limit="2048" disconnect-delay="256"
+						  message-cache-size="1024" heartbeat-time="20">
+			<websocket:transport-handlers register-defaults="false">
+				<bean class="org.springframework.web.socket.sockjs.transport.handler.XhrPollingTransportHandler"/>
+				<ref bean="xhrStreamingTransportHandler"/>
+			</websocket:transport-handlers>
+		</websocket:sockjs>
+	</websocket:handlers>
 
-    <bean id="testHandler"
-          class="org.springframework.web.socket.config.TestWebSocketHandler"/>
+	<bean id="testHandler"
+		  class="org.springframework.web.socket.config.TestWebSocketHandler"/>
 
-    <bean id="xhrStreamingTransportHandler"
-          class="org.springframework.web.socket.sockjs.transport.handler.XhrStreamingTransportHandler"/>
+	<bean id="xhrStreamingTransportHandler"
+		  class="org.springframework.web.socket.sockjs.transport.handler.XhrStreamingTransportHandler"/>
 
-    <bean id="testTaskScheduler"
-          class="org.springframework.web.socket.config.TestTaskScheduler"/>
+	<bean id="testTaskScheduler"
+		  class="org.springframework.web.socket.config.TestTaskScheduler"/>
 
 </beans>
diff --git a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-sockjs.xml b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-sockjs.xml
index c39d33fd361..689cddd19be 100644
--- a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-sockjs.xml
+++ b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-sockjs.xml
@@ -1,17 +1,17 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:websocket="http://www.springframework.org/schema/websocket"
-       xsi:schemaLocation="
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:websocket="http://www.springframework.org/schema/websocket"
+	   xsi:schemaLocation="
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd">
 
-    <websocket:handlers>
-        <websocket:mapping path="/test" handler="testHandler"/>
-        <websocket:mapping path="/foo/" handler="fooHandler"/>
-        <websocket:sockjs/>
-    </websocket:handlers>
+	<websocket:handlers>
+		<websocket:mapping path="/test" handler="testHandler"/>
+		<websocket:mapping path="/foo/" handler="fooHandler"/>
+		<websocket:sockjs/>
+	</websocket:handlers>
 
-    <bean id="testHandler" class="org.springframework.web.socket.config.TestWebSocketHandler"/>
-    <bean id="fooHandler" class="org.springframework.web.socket.config.FooWebSocketHandler"/>
+	<bean id="testHandler" class="org.springframework.web.socket.config.TestWebSocketHandler"/>
+	<bean id="fooHandler" class="org.springframework.web.socket.config.FooWebSocketHandler"/>
 
 </beans>
diff --git a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers.xml b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers.xml
index 9de9921e4cc..138eb8e3c32 100644
--- a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers.xml
+++ b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers.xml
@@ -1,19 +1,19 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:websocket="http://www.springframework.org/schema/websocket"
-       xsi:schemaLocation="
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:websocket="http://www.springframework.org/schema/websocket"
+	   xsi:schemaLocation="
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd">
 
-    <websocket:handlers>
-        <websocket:mapping path="/foo,/bar" handler="fooHandler"/>
-    </websocket:handlers>
+	<websocket:handlers>
+		<websocket:mapping path="/foo,/bar" handler="fooHandler"/>
+	</websocket:handlers>
 
-    <websocket:handlers>
-        <websocket:mapping path="/test" handler="testHandler"/>
-    </websocket:handlers>
+	<websocket:handlers>
+		<websocket:mapping path="/test" handler="testHandler"/>
+	</websocket:handlers>
 
-    <bean id="testHandler" class="org.springframework.web.socket.config.TestWebSocketHandler"/>
-    <bean id="fooHandler" class="org.springframework.web.socket.config.FooWebSocketHandler"/>
+	<bean id="testHandler" class="org.springframework.web.socket.config.TestWebSocketHandler"/>
+	<bean id="fooHandler" class="org.springframework.web.socket.config.FooWebSocketHandler"/>
 
 </beans>