Switched 'order' attributes across namespaces to 'xsd:token'

Issue: SPR-10886
Issue: SPR-7342

spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-4.0.xsd

@@ -197,7 +197,7 @@
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="order" type="xsd:int">
+		<xsd:attribute name="order" type="xsd:token">
 			<xsd:annotation>
 				<xsd:documentation source="java:org.springframework.core.Ordered"><![CDATA[
 	Controls the ordering of the execution of this aspect when multiple
@@ -386,7 +386,7 @@
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="order" type="xsd:int">
+		<xsd:attribute name="order" type="xsd:token">
 			<xsd:annotation>
 				<xsd:documentation source="java:org.springframework.core.Ordered"><![CDATA[
 	Controls the ordering of the execution of this advice when multiple

spring-context/src/main/resources/org/springframework/cache/config/spring-cache-4.0.xsd

@@ -96,7 +96,7 @@
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="order" type="xsd:int">
+			<xsd:attribute name="order" type="xsd:token">
 				<xsd:annotation>
 					<xsd:documentation source="java:org.springframework.core.Ordered"><![CDATA[
 	Controls the ordering of the execution of the cache advisor

spring-context/src/main/resources/org/springframework/context/config/spring-context-4.0.xsd

@@ -47,7 +47,7 @@
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="order" type="xsd:integer">
+		<xsd:attribute name="order" type="xsd:token">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 	Specifies the order for this placeholder configurer.  If more than one is present in a context

spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-4.0.xsd

@@ -131,7 +131,7 @@
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="order" type="xsd:int">
+			<xsd:attribute name="order" type="xsd:token">
 				<xsd:annotation>
 					<xsd:documentation source="java:org.springframework.core.Ordered"><![CDATA[
 	Controls the ordering of the execution of the transaction advisor
@@ -209,7 +209,7 @@
 							</xsd:restriction>
 						</xsd:simpleType>
 					</xsd:attribute>
-					<xsd:attribute name="timeout" type="xsd:integer" default="-1">
+					<xsd:attribute name="timeout" type="xsd:int" default="-1">
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[
 	The transaction timeout value (in seconds).

spring-tx/src/test/java/org/springframework/transaction/annotation/annotationTransactionNamespaceHandlerTests.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:aop="http://www.springframework.org/schema/aop"
 	   xmlns:context="http://www.springframework.org/schema/context"
 	   xmlns:tx="http://www.springframework.org/schema/tx"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
-       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
-       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
+       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd">
 
-	<tx:annotation-driven/>
+	<tx:annotation-driven order="#{ T(java.lang.Integer).MAX_VALUE }"/>
 
 	<bean id="transactionManager" class="org.springframework.tests.transaction.CallCountingTransactionManager"/>
 

spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.0.xsd

@@ -354,7 +354,7 @@
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="order" type="xsd:int">
+			<xsd:attribute name="order" type="xsd:token">
 				<xsd:annotation>
 					<xsd:documentation>
 						<![CDATA[

spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.0.xsd

@@ -24,7 +24,7 @@
             attributeFormDefault="unqualified">
 
     <xsd:import namespace="http://www.springframework.org/schema/beans"
-                schemaLocation="http://www.springframework.org/schema/beans/spring-beans-4.0.xsd" />
+                schemaLocation="http://www.springframework.org/schema/beans/spring-beans-4.0.xsd"/>
 
     <xsd:complexType name="mapping">
         <xsd:annotation>
@@ -236,7 +236,7 @@
                 ]]></xsd:documentation>
             </xsd:annotation>
         </xsd:attribute>
-        <xsd:attribute name="relay-port" type="xsd:integer">
+        <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.
@@ -296,7 +296,7 @@
         <xsd:attribute name="auto-startup" type="xsd:boolean">
             <xsd:annotation>
                 <xsd:documentation source="java:org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler"><![CDATA[
-        Wether or not the StompBrokerRelay should be automatically started as part of its SmartLifecycle,
+	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>
@@ -424,12 +424,12 @@
         </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="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:integer">
+            <xsd:attribute name="order" type="xsd:token">
                 <xsd:annotation>
                     <xsd:documentation><![CDATA[
 	Order value for this SimpleUrlHandlerMapping.
@@ -450,8 +450,7 @@
 	A StompSubProtocolHandler is registered
 	to handle various versions of the STOMP protocol.
 
-        See EnableWebSocketMessageBroker
-        Javadoc for information on code-based alternatives to enabling broker-backed messaging.
+	See EnableWebSocketMessageBroker javadoc for information on code-based alternatives to enabling broker-backed messaging.
             ]]></xsd:documentation>
         </xsd:annotation>
         <xsd:complexType>
@@ -464,7 +463,7 @@
                     </xsd:annotation>
                     <xsd:complexType>
                         <xsd:sequence>
-                            <xsd:element name="handshake-handler" type="handshake-handler" minOccurs="0" maxOccurs="1" />
+                            <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">
@@ -478,8 +477,8 @@
                     </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: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>
@@ -563,7 +562,7 @@
                     ]]></xsd:documentation>
                 </xsd:annotation>
             </xsd:attribute>
-            <xsd:attribute name="order" type="xsd:integer">
+            <xsd:attribute name="order" type="xsd:token">
                 <xsd:annotation>
                     <xsd:documentation><![CDATA[
 	Order value for this SimpleUrlHandlerMapping.