diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.1.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.1.xsd
index 8398e0c0c9..7eae5abd81 100644
--- a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.1.xsd
+++ b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.1.xsd
@@ -384,7 +384,7 @@
 				Defines a message channel.
 			</xsd:documentation>
 		</xsd:annotation>
-		<xsd:attribute name="id" type="xsd:ID" use="required" />
+		<xsd:attribute name="id" type="xsd:string" use="required" />
 		<xsd:attribute name="scope" type="xsd:string" />
 		<xsd:attribute name="datatype" type="xsd:string">
 			<xsd:annotation>
@@ -517,7 +517,7 @@
 					</xsd:complexType>
 				</xsd:element>
 			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:ID" use="optional" />
+			<xsd:attribute name="id" type="xsd:string" use="optional" />
 			<xsd:attribute name="service-interface" type="xsd:string" use="optional">
 				<xsd:annotation>
 					<xsd:documentation>	
@@ -816,7 +816,7 @@ endpoint itself is a Polling Consumer for a channel with a queue.
 	</xsd:attributeGroup>
 
 	<xsd:attributeGroup name="channelAdapterAttributes">
-		<xsd:attribute name="id" type="xsd:ID" />
+		<xsd:attribute name="id" type="xsd:string" />
 		<xsd:attribute name="channel" type="xsd:string">
 			<xsd:annotation>
 				<xsd:appinfo>
@@ -1125,7 +1125,7 @@ endpoint itself is a Polling Consumer for a channel with a queue.
 		<xsd:complexType>
 			<xsd:complexContent>
 				<xsd:extension base="basePollerType">
-					<xsd:attribute name="id" type="xsd:ID" />
+					<xsd:attribute name="id" type="xsd:string" />
 					<xsd:attribute name="default" type="xsd:boolean" default="false" />
 				</xsd:extension>
 			</xsd:complexContent>
@@ -1307,7 +1307,7 @@ endpoint itself is a Polling Consumer for a channel with a queue.
 				<xsd:element name="selector" type="selectorType" />
 				<xsd:element ref="selector-chain" />
 			</xsd:choice>
-			<xsd:attribute name="id" type="xsd:ID" />
+			<xsd:attribute name="id" type="xsd:string" />
 			<xsd:attribute name="voting-strategy" default="ALL">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
@@ -2617,7 +2617,7 @@ Name of the header whose value will be used to route messages
 				Defines a Wire Tap Channel Interceptor.
 			</xsd:documentation>
 		</xsd:annotation>
-		<xsd:attribute name="id" type="xsd:ID" use="optional" />
+		<xsd:attribute name="id" type="xsd:string" use="optional" />
 		<xsd:attribute name="channel" type="xsd:string" use="required">
 			<xsd:annotation>
 				<xsd:appinfo>
@@ -2795,7 +2795,7 @@ Name of the header whose value will be used to route messages
 					</xsd:complexType>
 				</xsd:element>
 			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:ID" use="required" />
+			<xsd:attribute name="id" type="xsd:string" use="required" />
 			<xsd:attribute name="default-channel" type="xsd:string" default="nullChannel">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
@@ -2966,7 +2966,7 @@ The list of component name patterns you want to track (e.g.,  tracked-components
 	</xsd:complexType>
 
 	<xsd:attributeGroup name="inputOutputChannelGroup">
-		<xsd:attribute name="id" type="xsd:ID" />
+		<xsd:attribute name="id" type="xsd:string" />
 		<xsd:attribute name="output-channel" type="xsd:string">
 			<xsd:annotation>
 				<xsd:appinfo>
diff --git a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.1.xsd b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.1.xsd
index 29748ed275..b2178ec5f3 100644
--- a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.1.xsd
+++ b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.1.xsd
@@ -24,7 +24,7 @@
             </xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
-			<xsd:attribute name="id" type="xsd:ID" use="optional" />
+			<xsd:attribute name="id" type="xsd:string" use="optional" />
 			<xsd:attribute name="channel" type="xsd:string" use="required">
 				<xsd:annotation>
 					<xsd:appinfo>
@@ -84,7 +84,7 @@
 			<xsd:all>
 				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1" />
 			</xsd:all>
-			<xsd:attribute name="id" type="xsd:ID" />
+			<xsd:attribute name="id" type="xsd:string" />
 			<xsd:attribute name="channel" type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>
diff --git a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.1.xsd b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.1.xsd
index d7fdd681cb..92a827ea1c 100644
--- a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.1.xsd
+++ b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.1.xsd
@@ -20,7 +20,7 @@
 					Defines an inbound HTTP-based Channel Adapter.
 				</xsd:documentation>
 			</xsd:annotation>
-			<xsd:attribute name="id" type="xsd:ID" />
+			<xsd:attribute name="id" type="xsd:string" />
 			<xsd:attribute name="name" type="xsd:string" />
 			<xsd:attribute name="channel" type="xsd:string" use="required">
 				<xsd:annotation>
@@ -224,7 +224,7 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re
 			<xsd:sequence>
 				<xsd:element name="uri-variable" type="uriVariableType" minOccurs="0" maxOccurs="unbounded" />
 			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:ID" />
+			<xsd:attribute name="id" type="xsd:string" />
 			<xsd:attribute name="url" type="xsd:string" use="required">
 				<xsd:annotation>
 					<xsd:documentation>
@@ -512,7 +512,7 @@ The String "HTTP_REQUEST_HEADERS" will match against any of the standard HTTP Re
 				Defines common configuration for gateway adapters.
 			</xsd:documentation>
 		</xsd:annotation>
-		<xsd:attribute name="id" type="xsd:ID" />
+		<xsd:attribute name="id" type="xsd:string" />
 		<xsd:attribute name="request-channel" type="xsd:string" use="required">
 			<xsd:annotation>
 				<xsd:appinfo>
diff --git a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.1.xsd b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.1.xsd
index 74de95b463..5c20ff8d7a 100644
--- a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.1.xsd
+++ b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.1.xsd
@@ -115,7 +115,7 @@ task executors such as a WorkManagerTaskExecutor.
 
 	<xsd:element name="tcp-inbound-channel-adapter">
 		<xsd:complexType>
-			<xsd:attribute name="id" type="xsd:ID"/>		
+			<xsd:attribute name="id" type="xsd:string"/>		
 			<xsd:attribute name="connection-factory" type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>
@@ -159,7 +159,7 @@ adapter.
 
 	<xsd:element name="tcp-outbound-channel-adapter">
 		<xsd:complexType>
-			<xsd:attribute name="id" type="xsd:ID"/>		
+			<xsd:attribute name="id" type="xsd:string"/>		
 			<xsd:attribute name="connection-factory" type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>
@@ -197,7 +197,7 @@ inbound message was received.
 
 	<xsd:element name="tcp-inbound-gateway">
 		<xsd:complexType>
-			<xsd:attribute name="id" type="xsd:ID"/>		
+			<xsd:attribute name="id" type="xsd:string"/>		
 			<xsd:attribute name="connection-factory" type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>
@@ -251,7 +251,7 @@ A connection factory is needed by an inbound adapter. The connection factory mus
 
 	<xsd:element name="tcp-outbound-gateway">
 		<xsd:complexType>
-			<xsd:attribute name="id" type="xsd:ID"/>		
+			<xsd:attribute name="id" type="xsd:string"/>		
 			<xsd:attribute name="connection-factory" type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>
@@ -297,7 +297,7 @@ A connection factory is needed by an outbound adapter. The connection factory mu
 
 	<xsd:element name="tcp-connection-factory">
 		<xsd:complexType>
-			<xsd:attribute name="id" type="xsd:ID"/>
+			<xsd:attribute name="id" type="xsd:string"/>
 			<xsd:attribute name="type">
 				<xsd:annotation>
 					<xsd:documentation>
@@ -461,7 +461,7 @@ message headers (ip_connectionId, ip_hostName). Default "true".
 	</xsd:complexType>
 
 	<xsd:complexType name="common-attributes">
-		<xsd:attribute name="id" type="xsd:ID"/>
+		<xsd:attribute name="id" type="xsd:string"/>
 		<xsd:attribute name="port" type="xsd:string" />
 		<xsd:attribute name="so-receive-buffer-size" type="xsd:string" />
 		<xsd:attribute name="so-send-buffer-size" type="xsd:string" />
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.1.xsd b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.1.xsd
index 59dea96f31..bae16b9dfd 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.1.xsd
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.1.xsd
@@ -144,7 +144,7 @@
 						</xsd:element>
 						<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1" />
 					</xsd:sequence>
-					<xsd:attribute name="id" type="xsd:ID" use="optional"/>
+					<xsd:attribute name="id" type="xsd:string" use="optional"/>
 					<xsd:attribute name="update" type="xsd:string">
 						<xsd:annotation>
 							<xsd:appinfo>
@@ -268,7 +268,7 @@
 							</xsd:appinfo>
 						</xsd:annotation>
 					</xsd:attribute>
-					<xsd:attribute name="id" type="xsd:ID" use="optional"/>
+					<xsd:attribute name="id" type="xsd:string" use="optional"/>
 					<xsd:attribute name="channel" type="xsd:string" use="required">
 						<xsd:annotation>
 							<xsd:appinfo>
@@ -348,7 +348,7 @@
 						</xsd:element>
 						<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
 					</xsd:sequence>
-					<xsd:attribute name="id" type="xsd:ID" use="optional"/>
+					<xsd:attribute name="id" type="xsd:string" use="optional"/>
 					<xsd:attribute name="update" type="xsd:string">
 						<xsd:annotation>
 							<xsd:appinfo>
diff --git a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.1.xsd b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.1.xsd
index 1dd9054225..3dab7f31f1 100644
--- a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.1.xsd
+++ b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.1.xsd
@@ -127,7 +127,7 @@
 				</xsd:annotation>
 			</xsd:element>
 		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:ID" use="required">
+		<xsd:attribute name="id" type="xsd:string" use="required">
 			<xsd:annotation>
 				<xsd:documentation>
 	ID for this channel. Required.
@@ -648,7 +648,7 @@
 			<xsd:sequence>
 				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
 			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:ID"/>
+			<xsd:attribute name="id" type="xsd:string"/>
 			<xsd:attribute name="request-channel" type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>
@@ -1003,7 +1003,7 @@
 	Common configuration for JMS-based adapters.
 			</xsd:documentation>
 		</xsd:annotation>
-		<xsd:attribute name="id" type="xsd:ID"/>
+		<xsd:attribute name="id" type="xsd:string"/>
 		<xsd:attribute name="connection-factory" type="xsd:string">
 			<xsd:annotation>
 				<xsd:appinfo>
@@ -1039,7 +1039,7 @@
 	</xsd:complexType>
 
 	<xsd:complexType name="transformerType">
-		<xsd:attribute name="id" type="xsd:ID"/>
+		<xsd:attribute name="id" type="xsd:string"/>
 		<xsd:attribute name="input-channel" type="xsd:string">
 			<xsd:annotation>
 				<xsd:appinfo>
diff --git a/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-2.1.xsd b/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-2.1.xsd
index 0f245dbd36..6eb0546674 100644
--- a/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-2.1.xsd
+++ b/spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-2.1.xsd
@@ -170,7 +170,7 @@
 	</xsd:complexType>
 
 	<xsd:complexType name="mbeanServerIdentifyerType">
-		<xsd:attribute name="id" type="xsd:ID" use="optional" />
+		<xsd:attribute name="id" type="xsd:string" use="optional" />
 		<xsd:attribute name="server" type="xsd:string" default="mbeanServer">
 			<xsd:annotation>
 				<xsd:documentation>
diff --git a/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-2.1.xsd b/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-2.1.xsd
index df81f21e49..12dca02c0c 100644
--- a/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-2.1.xsd
+++ b/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-2.1.xsd
@@ -58,7 +58,7 @@
 				</xsd:annotation>
 			</xsd:element>
 		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:ID" use="required">
+		<xsd:attribute name="id" type="xsd:string" use="required">
 			<xsd:annotation>
 				<xsd:documentation>
 	ID for this channel. Required.
@@ -266,7 +266,7 @@
 	Common configuration for Redis adapters.
 			</xsd:documentation>
 		</xsd:annotation>
-		<xsd:attribute name="id" type="xsd:ID"/>
+		<xsd:attribute name="id" type="xsd:string"/>
 		<xsd:attribute name="connection-factory" type="xsd:string">
 			<xsd:annotation>
 				<xsd:appinfo>
diff --git a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-2.1.xsd b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-2.1.xsd
index 7610abaf04..2d798afa77 100644
--- a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-2.1.xsd
+++ b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-2.1.xsd
@@ -79,7 +79,7 @@
 	Defines common configuration for gateway adapters.
 			</xsd:documentation>
 		</xsd:annotation>
-		<xsd:attribute name="id" type="xsd:ID"/>
+		<xsd:attribute name="id" type="xsd:string"/>
 		<xsd:attribute name="name" type="xsd:string"/>
 		<xsd:attribute name="request-channel" type="xsd:string" use="required">
 			<xsd:annotation>
diff --git a/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-2.1.xsd b/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-2.1.xsd
index c4c66153c5..79edb5c632 100644
--- a/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-2.1.xsd
+++ b/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-2.1.xsd
@@ -368,7 +368,7 @@
 					</xsd:complexType>
 				</xsd:element>
 			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:ID"/>
+			<xsd:attribute name="id" type="xsd:string"/>
 			<xsd:attribute name="evaluate-as-string" type="xsd:boolean" default="false">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
@@ -445,7 +445,7 @@
 			<xsd:sequence>
 				<xsd:element ref="xpath-expression" minOccurs="0" maxOccurs="1"/>
 			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:ID"/>
+			<xsd:attribute name="id" type="xsd:string"/>
 			<xsd:attribute name="xpath-expression-ref" type="xsd:string" use="optional">
 				<xsd:annotation>
 					<xsd:appinfo>
@@ -477,7 +477,7 @@
 			<xsd:sequence>
 				<xsd:element ref="beans:map" minOccurs="0" maxOccurs="1"/>
 			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:ID" use="optional"/>
+			<xsd:attribute name="id" type="xsd:string" use="optional"/>
 			<xsd:attribute name="expression" type="xsd:string" use="optional"/>
 			<xsd:attribute name="ns-prefix" type="xsd:string" use="optional"/>
 			<xsd:attribute name="ns-uri" type="xsd:string" use="optional"/>
@@ -531,7 +531,7 @@
 			<xsd:sequence>
 				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
 			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:ID"/>
+			<xsd:attribute name="id" type="xsd:string"/>
 			<xsd:attribute name="input-channel" type="xsd:string">
 				<xsd:annotation>
 					<xsd:appinfo>
@@ -583,7 +583,7 @@
 		<xsd:sequence>
 			<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
 		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:ID"/>
+		<xsd:attribute name="id" type="xsd:string"/>
 		<xsd:attribute name="input-channel" type="xsd:string">
 			<xsd:annotation>
 				<xsd:appinfo>