diff --git a/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket.xsd b/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket.xsd
index df38c62614..a1ef2f95f6 100644
--- a/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket.xsd
+++ b/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket.xsd
@@ -148,7 +148,7 @@
                 ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="stream-bytes-limit" type="xsd:string">
+		<xsd:attribute name="stream-bytes-limit" type="xsd:int">
 			<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.
@@ -165,7 +165,7 @@
                 ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="heartbeat-time" type="xsd:string">
+		<xsd:attribute name="heartbeat-time" type="xsd:long">
 			<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
@@ -174,7 +174,7 @@
                 ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="disconnect-delay" type="xsd:string">
+		<xsd:attribute name="disconnect-delay" type="xsd:long">
 			<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
@@ -183,7 +183,7 @@
                 ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="message-cache-size" type="xsd:string">
+		<xsd:attribute name="message-cache-size" type="xsd:int">
 			<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
@@ -192,7 +192,7 @@
                 ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="websocket-enabled" type="xsd:string">
+		<xsd:attribute name="websocket-enabled" type="xsd:boolean">
 			<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.
@@ -216,7 +216,7 @@
                 ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="suppress-cors" type="xsd:string">
+		<xsd:attribute name="suppress-cors" type="xsd:boolean">
 			<xsd:annotation>
 				<xsd:documentation source="java:org.springframework.web.socket.sockjs.support.AbstractSockJsService"><![CDATA[
 	This option can be used to disable automatic addition of CORS headers for SockJS requests.
@@ -252,7 +252,7 @@
                 ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="relay-port" type="xsd:string">
+		<xsd:attribute name="relay-port" type="xsd:int">
 			<xsd:annotation>
 				<xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
 	The STOMP message broker port.
@@ -295,14 +295,14 @@
                 ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="heartbeat-send-interval" type="xsd:string">
+		<xsd:attribute name="heartbeat-send-interval" type="xsd:long">
 			<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:attribute name="heartbeat-receive-interval" type="xsd:long">
 			<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.
@@ -416,7 +416,7 @@
 	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:attribute name="core-pool-size" type="xsd:int" use="optional">
 			<xsd:annotation>
 				<xsd:documentation source="java:org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"><![CDATA[
 	Set the core pool size of the ThreadPoolExecutor.
@@ -429,7 +429,7 @@
                 ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="max-pool-size" type="xsd:string" use="optional">
+		<xsd:attribute name="max-pool-size" type="xsd:int" use="optional">
 			<xsd:annotation>
 				<xsd:documentation source="java:org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"><![CDATA[
 	 Set the max pool size of the ThreadPoolExecutor.
@@ -439,7 +439,7 @@
                 ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="keep-alive-seconds" type="xsd:string" use="optional">
+		<xsd:attribute name="keep-alive-seconds" type="xsd:int" 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.
@@ -449,7 +449,7 @@
                 ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="queue-capacity" type="xsd:string" use="optional">
+		<xsd:attribute name="queue-capacity" type="xsd:int" use="optional">
 			<xsd:annotation>
 				<xsd:documentation source="java:org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor"><![CDATA[
 	 Set the queue capacity for the ThreadPoolExecutor.
@@ -596,7 +596,7 @@
 								</xsd:complexType>
 							</xsd:element>
 						</xsd:sequence>
-						<xsd:attribute name="message-size" type="xsd:string">
+						<xsd:attribute name="message-size" type="xsd:int">
 							<xsd:annotation>
 								<xsd:documentation><![CDATA[
 	Configure the maximum size for an incoming sub-protocol message.
@@ -619,7 +619,7 @@
                                 ]]></xsd:documentation>
 							</xsd:annotation>
 						</xsd:attribute>
-						<xsd:attribute name="send-timeout" type="xsd:string">
+						<xsd:attribute name="send-timeout" type="xsd:int">
 							<xsd:annotation>
 								<xsd:documentation><![CDATA[
 	Configure a time limit (in milliseconds) for the maximum amount of a time
@@ -654,7 +654,7 @@
                                 ]]></xsd:documentation>
 							</xsd:annotation>
 						</xsd:attribute>
-						<xsd:attribute name="send-buffer-size" type="xsd:string">
+						<xsd:attribute name="send-buffer-size" type="xsd:int">
 							<xsd:annotation>
 								<xsd:documentation><![CDATA[
 	Configure the maximum amount of data to buffer when sending messages
@@ -683,7 +683,7 @@
                                 ]]></xsd:documentation>
 							</xsd:annotation>
 						</xsd:attribute>
-						<xsd:attribute name="time-to-first-message" type="xsd:string">
+						<xsd:attribute name="time-to-first-message" type="xsd:int">
 							<xsd:annotation>
 								<xsd:documentation><![CDATA[
 	 Set the maximum time allowed in milliseconds after the WebSocket