diff --git a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/spring-integration-mail-1.0.xsd b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/spring-integration-mail-1.0.xsd
index a2e37a9348..4b45ffa1c8 100644
--- a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/spring-integration-mail-1.0.xsd
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/spring-integration-mail-1.0.xsd
@@ -100,7 +100,7 @@
 					<xsd:attribute name="bcc" type="xsd:string"/>
 					<xsd:attribute name="from" type="xsd:string"/>
 					<xsd:attribute name="reply-to" type="xsd:string"/>
-					<xsd:attribute name="overwrite" type="xsd:boolean"/>
+					<xsd:attribute name="overwrite" type="xsd:string"/>
 				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
diff --git a/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/config/spring-integration-rmi-1.0.xsd b/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/config/spring-integration-rmi-1.0.xsd
index 136cc65ff3..00e9a10508 100644
--- a/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/config/spring-integration-rmi-1.0.xsd
+++ b/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/config/spring-integration-rmi-1.0.xsd
@@ -25,9 +25,9 @@
 			</xsd:annotation>
 			<xsd:complexContent>
 				<xsd:extension base="gatewayType">
-					<xsd:attribute name="expect-reply" type="xsd:boolean" default="true"/>
+					<xsd:attribute name="expect-reply" type="xsd:string" default="true"/>
 					<xsd:attribute name="registry-host" type="xsd:string"/>
-					<xsd:attribute name="registry-port" type="xsd:integer"/>
+					<xsd:attribute name="registry-port" type="xsd:string"/>
 					<xsd:attribute name="remote-invocation-executor" type="xsd:string"/>
 				</xsd:extension>
 			</xsd:complexContent>
@@ -44,7 +44,7 @@
 			<xsd:complexContent>
 				<xsd:extension base="gatewayType">
 					<xsd:attribute name="host" type="xsd:string" use="required"/>
-					<xsd:attribute name="port" type="xsd:integer"/>
+					<xsd:attribute name="port" type="xsd:string"/>
 					<xsd:attribute name="remote-channel" type="xsd:string" use="required"/>
 				</xsd:extension>
 			</xsd:complexContent>
@@ -61,8 +61,8 @@
 		<xsd:attribute name="name" type="xsd:string"/>
 		<xsd:attribute name="request-channel" type="xsd:string" use="required"/>
 		<xsd:attribute name="reply-channel" type="xsd:string"/>
-		<xsd:attribute name="request-timeout" type="xsd:long"/>
-		<xsd:attribute name="reply-timeout" type="xsd:long"/>
+		<xsd:attribute name="request-timeout" type="xsd:string"/>
+		<xsd:attribute name="reply-timeout" type="xsd:string"/>
 	</xsd:complexType>
 
 </xsd:schema>
\ No newline at end of file
diff --git a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/config/spring-integration-stream-1.0.xsd b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/config/spring-integration-stream-1.0.xsd
index 5b37395f82..2628b1a134 100644
--- a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/config/spring-integration-stream-1.0.xsd
+++ b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/config/spring-integration-stream-1.0.xsd
@@ -49,7 +49,7 @@
 		<xsd:attribute name="id" type="xsd:string"/>
 		<xsd:attribute name="channel" type="xsd:string"/>
 		<xsd:attribute name="charset" type="xsd:string"/>
-		<xsd:attribute name="append-newline" type="xsd:boolean" default="false"/>
+		<xsd:attribute name="append-newline" type="xsd:string" default="false"/>
 	</xsd:complexType>
 
 </xsd:schema>
diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd
index 2e8b761f10..505eb22ed3 100644
--- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd
+++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd
@@ -26,17 +26,17 @@
 			</xsd:annotation>
 			<xsd:complexContent>
 				<xsd:extension base="inputOutputEndpoint">
-					<xsd:attribute name="marshaller" type="xsd:string" use="required" />
+					<xsd:attribute name="marshaller" type="xsd:string" use="required"/>
 					<xsd:attribute name="result-type" use="optional">
 						<xsd:simpleType>
 							<xsd:restriction base="xsd:string">
-								<xsd:enumeration value="DOMResult" />
-								<xsd:enumeration value="StringResult" />
+								<xsd:enumeration value="DOMResult"/>
+								<xsd:enumeration value="StringResult"/>
 							</xsd:restriction>
 						</xsd:simpleType>
 					</xsd:attribute>
-					<xsd:attribute name="result-factory" use="optional" />
-					<xsd:attribute name="result-transformer" type="xsd:string" use="optional" />
+					<xsd:attribute name="result-factory" type="xsd:string" use="optional"/>
+					<xsd:attribute name="result-transformer" type="xsd:string" use="optional"/>
 				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
@@ -51,7 +51,7 @@
 			</xsd:annotation>
 			<xsd:complexContent>
 				<xsd:extension base="inputOutputEndpoint">
-					<xsd:attribute name="unmarshaller" type="xsd:string" use="required" />
+					<xsd:attribute name="unmarshaller" type="xsd:string" use="required"/>
 				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
@@ -66,19 +66,19 @@
 			</xsd:annotation>
 			<xsd:complexContent>
 				<xsd:extension base="inputOutputEndpoint">
-					<xsd:attribute name="xsl-resource" type="xsd:string" use="optional" />
-					<xsd:attribute name="xsl-templates" type="xsd:string" use="optional" />
-					<xsd:attribute name="source-factory" type="xsd:string" use="optional" />
-					<xsd:attribute name="result-factory" type="xsd:string" use="optional" />
+					<xsd:attribute name="xsl-resource" type="xsd:string" use="optional"/>
+					<xsd:attribute name="xsl-templates" type="xsd:string" use="optional"/>
+					<xsd:attribute name="source-factory" type="xsd:string" use="optional"/>
+					<xsd:attribute name="result-factory" type="xsd:string" use="optional"/>
 					<xsd:attribute name="result-type" use="optional">
 						<xsd:simpleType>
 							<xsd:restriction base="xsd:string">
-								<xsd:enumeration value="DOMResult" />
-								<xsd:enumeration value="StringResult" />
+								<xsd:enumeration value="DOMResult"/>
+								<xsd:enumeration value="StringResult"/>
 							</xsd:restriction>
 						</xsd:simpleType>
 					</xsd:attribute>
-					<xsd:attribute name="result-transformer" type="xsd:string" use="optional" />
+					<xsd:attribute name="result-transformer" type="xsd:string" use="optional"/>
 				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
@@ -92,13 +92,13 @@
 				</xsd:documentation>
 			</xsd:annotation>
 			<xsd:sequence>
-				<xsd:element ref="xpath-expression" maxOccurs="1" minOccurs="0" />
+				<xsd:element ref="xpath-expression" minOccurs="0" maxOccurs="1"/>
 				<xsd:element ref="si-core:poller" minOccurs="0" maxOccurs="1"/>
 			</xsd:sequence>
-			<xsd:attribute name="input-channel" type="xsd:string" use="required" />
-			<xsd:attribute name="id" type="xsd:string" use="required" />
-			<xsd:attribute name="xpath-expression-ref" type="xsd:string" use="optional" />
-			<xsd:attribute name="multi-channel" type="xsd:boolean" default="false" />
+			<xsd:attribute name="id" type="xsd:string" use="required"/>
+			<xsd:attribute name="input-channel" type="xsd:string" use="required"/>
+			<xsd:attribute name="xpath-expression-ref" type="xsd:string" use="optional"/>
+			<xsd:attribute name="multi-channel" type="xsd:string" default="false"/>
 		</xsd:complexType>
 	</xsd:element>
 
@@ -110,19 +110,19 @@
 				</xsd:documentation>
 			</xsd:annotation>
 			<xsd:sequence>
-				<xsd:element ref="xpath-expression" maxOccurs="1" minOccurs="0" />
+				<xsd:element ref="xpath-expression" minOccurs="0" maxOccurs="1"/>
 			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:string" use="required" />
-				<xsd:attribute name="xpath-expression-ref" type="xsd:string" use="optional" />
+			<xsd:attribute name="id" type="xsd:string" use="required"/>
+			<xsd:attribute name="xpath-expression-ref" type="xsd:string" use="optional"/>
 			<xsd:attribute name="evaluation-result-type" use="required">
 				<xsd:simpleType>
 					<xsd:restriction base="xsd:string">
-						<xsd:enumeration value="boolean" />
-						<xsd:enumeration value="string" />
+						<xsd:enumeration value="boolean"/>
+						<xsd:enumeration value="string"/>
 					</xsd:restriction>
 				</xsd:simpleType>
 			</xsd:attribute>
-			<xsd:attribute name="string-test-value" type="xsd:string" use="optional" />
+			<xsd:attribute name="string-test-value" type="xsd:string" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
 
@@ -136,49 +136,41 @@
 			<xsd:sequence>
 				<xsd:element ref="beans:map" minOccurs="0" maxOccurs="1"/>
 			</xsd:sequence>
-			<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" />
-			<xsd:attribute name="namespace-map" type="xsd:string" 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"/>
+			<xsd:attribute name="namespace-map" type="xsd:string" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
 
 	<xsd:element name="xpath-splitter">
+		<xsd:annotation>
+			<xsd:documentation>
+	Defines an XPath splitter.
+			</xsd:documentation>
+		</xsd:annotation>
 		<xsd:complexType>
-		
-			<xsd:annotation>
-				<xsd:documentation>
-					Defines an XPath splitter.
-				</xsd:documentation>
-			</xsd:annotation>
 			<xsd:complexContent>
 				<xsd:extension base="inputOutputEndpoint">
 					<xsd:sequence>
-						<xsd:element ref="xpath-expression" maxOccurs="1" minOccurs="0" />
+						<xsd:element ref="xpath-expression" minOccurs="0" maxOccurs="1"/>
 					</xsd:sequence>
-					<xsd:attribute name="xpath-expression-ref" type="xsd:string"
-						use="optional" />
-					<xsd:attribute name="doc-builder-factory" type="xsd:string"
-						use="optional" />
-					<xsd:attribute name="create-documents" type="xsd:boolean"
-						use="optional" />
+					<xsd:attribute name="xpath-expression-ref" type="xsd:string" use="optional"/>
+					<xsd:attribute name="doc-builder-factory" type="xsd:string" use="optional"/>
+					<xsd:attribute name="create-documents" type="xsd:string" use="optional"/>
 				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
 	</xsd:element>
-	
-	
-	
+
 	<xsd:complexType name="inputOutputEndpoint">
 		<xsd:sequence>
 			<xsd:element ref="si-core:poller" minOccurs="0" maxOccurs="1"/>
 		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:string" use="optional" />
-		<xsd:attribute name="input-channel" type="xsd:string" use="required" />
-		<xsd:attribute name="output-channel" type="xsd:string" use="required" />
+		<xsd:attribute name="id" type="xsd:string" use="optional"/>
+		<xsd:attribute name="input-channel" type="xsd:string" use="required"/>
+		<xsd:attribute name="output-channel" type="xsd:string" use="required"/>
 	</xsd:complexType>
-	
-	
 
 </xsd:schema>
\ No newline at end of file