diff --git a/org.springframework.integration.ws/src/main/resources/META-INF/spring.schemas b/org.springframework.integration.ws/src/main/resources/META-INF/spring.schemas
index 58efe84c83..9cd46a1db0 100644
--- a/org.springframework.integration.ws/src/main/resources/META-INF/spring.schemas
+++ b/org.springframework.integration.ws/src/main/resources/META-INF/spring.schemas
@@ -1 +1,3 @@
http\://www.springframework.org/schema/integration/ws/spring-integration-ws-1.0.xsd=org/springframework/integration/ws/config/spring-integration-ws-1.0.xsd
+http\://www.springframework.org/schema/integration/ws/spring-integration-ws-2.0.xsd=org/springframework/integration/ws/config/spring-integration-ws-2.0.xsd
+http\://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd=org/springframework/integration/ws/config/spring-integration-ws-2.0.xsd
\ No newline at end of file
diff --git a/org.springframework.integration.ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-2.0.xsd b/org.springframework.integration.ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-2.0.xsd
new file mode 100644
index 0000000000..dd0d67e93a
--- /dev/null
+++ b/org.springframework.integration.ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-2.0.xsd
@@ -0,0 +1,226 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Defines a Web Service based outbound Messaging Gateway.
+
+
+
+
+
+
+
+
+ A unique identifier for this Gateway.
+
+
+
+
+
+
+ The channel where Messages should be sent to invoke the Web Service.
+
+
+
+
+
+
+
+
+
+
+
+ The channel where Messages created from the Web Service responses will be sent.
+ This is optional. However, if non-empty responses are expected and this is not set,
+ then the request Messages must contain a REPLY_CHANNEL header.
+
+
+
+
+
+
+
+
+
+
+
+ The Destination URI for this Web Service Gateway. If the URI should be determined at runtime
+ (e.g. registry lookup), then configure a 'destination-provider' reference instead.
+
+
+
+
+
+
+ Reference to a DestinationProvider implementation. Either provide this or a 'uri', never both.
+ See org.springframework.ws.client.support.destination.DestinationProvider for more detail.
+
+
+
+
+
+
+
+
+
+
+
+ Reference to a Spring OXM Mashaller. If the Marshaller instance also implements
+ the Unmarshaller interface, then the 'unmarshaller' attribute is not required.
+
+
+
+
+
+
+
+
+
+
+
+ Reference to a Spring OXM Unmarshaller.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Reference to a Spring Web Services SourceExtractor.
+
+
+
+
+
+
+
+
+
+
+
+ Reference to a Spring Web Services WebServiceMessageCallback. This enables changing
+ the Web Service request message after the payload has been written to it but prior
+ to invocation of the actual Web Service.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Defines a Web Service based inbound Messaging Gateway.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/org.springframework.integration.xml/src/main/resources/META-INF/spring.schemas b/org.springframework.integration.xml/src/main/resources/META-INF/spring.schemas
index 3682f0c9f9..5850bc5591 100644
--- a/org.springframework.integration.xml/src/main/resources/META-INF/spring.schemas
+++ b/org.springframework.integration.xml/src/main/resources/META-INF/spring.schemas
@@ -1 +1,3 @@
-http\://www.springframework.org/schema/integration/xml/spring-integration-xml-1.0.xsd=org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd
\ No newline at end of file
+http\://www.springframework.org/schema/integration/xml/spring-integration-xml-1.0.xsd=org/springframework/integration/xml/config/spring-integration-xml-1.0.xsd
+http\://www.springframework.org/schema/integration/xml/spring-integration-xml-2.0.xsd=org/springframework/integration/xml/config/spring-integration-xml-2.0.xsd
+http\://www.springframework.org/schema/integration/xml/spring-integration-xml.xsd=org/springframework/integration/xml/config/spring-integration-xml-2.0.xsd
\ No newline at end of file
diff --git a/org.springframework.integration.xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-2.0.xsd b/org.springframework.integration.xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-2.0.xsd
new file mode 100644
index 0000000000..eb76b76826
--- /dev/null
+++ b/org.springframework.integration.xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-2.0.xsd
@@ -0,0 +1,360 @@
+
+
+
+
+
+
+
+
+
+ Defines the configuration elements for Spring Integration's XML support.
+
+
+
+
+
+
+
+ Defines an XML marshalling transformer.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Defines an XML unmarshalling transformer.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Defines an XSLT transformer.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Defines an XPath router.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Defines an XPath selector.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Defines an XPath expression.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Defines an XPath splitter.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Defines a validating router.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file