diff --git a/org.springframework.integration.jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-ip-2.0.xsd b/org.springframework.integration.jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-ip-2.0.xsd
deleted file mode 100644
index 5aa81d2c66..0000000000
--- a/org.springframework.integration.jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-ip-2.0.xsd
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.springframework.org/schema/integration/ip"
-		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-		xmlns:beans="http://www.springframework.org/schema/beans"
-		xmlns:tool="http://www.springframework.org/schema/tool"
-		xmlns:integration="http://www.springframework.org/schema/integration"
-		targetNamespace="http://www.springframework.org/schema/integration/ip"
-		elementFormDefault="qualified"
-		attributeFormDefault="unqualified">
-
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
-	<xsd:import namespace="http://www.springframework.org/schema/integration"
-			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-2.0.xsd"/>
-
-	<xsd:annotation>
-		<xsd:documentation><![CDATA[
-	Defines the configuration elements for Spring Integration's IP adapters.
-		]]></xsd:documentation>
-	</xsd:annotation>
-
-	<xsd:element name="inbound-channel-adapter">
-		<xsd:annotation>
-			<xsd:documentation>
-	Defines an inbound Channel Adapter for receiving incoming IP packets.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="ipAdapterType">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					<xsd:attribute name="pool-size" type="xsd:string" />
-					<xsd:attribute name="receive-buffer-size" type="xsd:string" />
-					<xsd:attribute name="multicast-address" type="xsd:string" />
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="outbound-channel-adapter">
-		<xsd:annotation>
-			<xsd:documentation>
-	Defines an outbound IP packet-sending Channel Adapter.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="ipAdapterType">
-					<xsd:attribute name="host" type="xsd:string" />
-					<xsd:attribute name="acknowledge" type="xsd:string" />
-					<xsd:attribute name="ack-host" type="xsd:string" />
-					<xsd:attribute name="ack-port" type="xsd:string" />
-					<xsd:attribute name="ack-timeout" type="xsd:string" />
-					<xsd:attribute name="time-to-live" type="xsd:string" />
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:complexType name="ipAdapterType">
-		<xsd:annotation>
-			<xsd:documentation>
-	Common configuration for IP-based adapters.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:attribute name="id" type="xsd:ID"/>
-		<xsd:attribute name="channel" type="xsd:string" />
-		<xsd:attribute name="protocol">
-			<xsd:simpleType>
-				<xsd:restriction base="xsd:NMTOKEN">
-					<xsd:enumeration value="tcp" />
-					<xsd:enumeration value="udp" />
-				</xsd:restriction>
-			</xsd:simpleType>
-		</xsd:attribute>
-		<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" />
-		<xsd:attribute name="so-timeout" type="xsd:string" />
-		<xsd:attribute name="check-length" type="xsd:string" />
-		<xsd:attribute name="multicast" type="xsd:string" />
-	</xsd:complexType>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/org.springframework.integration.jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-ip.gif b/org.springframework.integration.jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-ip.gif
deleted file mode 100644
index 6d27c46df0..0000000000
Binary files a/org.springframework.integration.jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-ip.gif and /dev/null differ
diff --git a/org.springframework.integration.jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd b/org.springframework.integration.jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd
deleted file mode 100644
index a066b27b98..0000000000
--- a/org.springframework.integration.jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd
+++ /dev/null
@@ -1,508 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.springframework.org/schema/integration/jms"
-		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-		xmlns:beans="http://www.springframework.org/schema/beans"
-		xmlns:tool="http://www.springframework.org/schema/tool"
-		xmlns:integration="http://www.springframework.org/schema/integration"
-		targetNamespace="http://www.springframework.org/schema/integration/jms"
-		elementFormDefault="qualified"
-		attributeFormDefault="unqualified">
-
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
-	<xsd:import namespace="http://www.springframework.org/schema/integration"
-			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"/>
-
-	<xsd:annotation>
-		<xsd:documentation><![CDATA[
-	Defines the configuration elements for Spring Integration's JMS adapters.
-		]]></xsd:documentation>
-	</xsd:annotation>
-
-	<xsd:element name="message-driven-channel-adapter">
-		<xsd:annotation>
-			<xsd:documentation>
-	Defines a JMS Message-Driven inbound Channel Adapter.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="jmsMessageDrivenInboundAdapterType">
-					<xsd:attribute name="destination" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="javax.jms.Destination"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="destination-name" type="xsd:string"/>
-					<xsd:attribute name="channel" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="message-converter" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.jms.support.converter.MessageConverter"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="header-mapper" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.jms.JmsHeaderMapper"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="extract-payload" type="xsd:string" default="true"/>
-					<xsd:attribute name="send-timeout" type="xsd:string"/>
-					<xsd:attribute name="transaction-manager" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.transaction.PlatformTransactionManager"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="concurrent-consumers" type="xsd:string"/>
-					<xsd:attribute name="max-concurrent-consumers" type="xsd:string"/>
-					<xsd:attribute name="max-messages-per-task" type="xsd:string"/>
-					<xsd:attribute name="idle-task-execution-limit" type="xsd:string"/>
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="inbound-channel-adapter">
-		<xsd:annotation>
-			<xsd:documentation>
-	Defines an inbound Channel Adapter for polling a JMS Destination.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="jmsInboundAdapterType">
-					<xsd:sequence>
-						<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
-					</xsd:sequence>
-					<xsd:attribute name="destination" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="javax.jms.Destination"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="destination-name" type="xsd:string"/>
-					<xsd:attribute name="channel" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="header-mapper" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.jms.JmsHeaderMapper"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="extract-payload" type="xsd:string" default="true"/>
-					<xsd:attribute name="jms-template" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.jms.core.JmsTemplate"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="inbound-gateway">
-		<xsd:annotation>
-			<xsd:documentation>
-	Defines an inbound JMS-based Messaging Gateway.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="jmsMessageDrivenInboundAdapterType">
-					<xsd:attribute name="request-destination" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="javax.jms.Destination"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="request-destination-name" type="xsd:string"/>
-					<xsd:attribute name="default-reply-destination" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="javax.jms.Destination"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="default-reply-queue-name" type="xsd:string"/>
-					<xsd:attribute name="default-reply-topic-name" type="xsd:string"/>
-					<xsd:attribute name="message-converter" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.jms.support.converter.MessageConverter"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="header-mapper" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.jms.JmsHeaderMapper"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="extract-request-payload" type="xsd:string" default="true"/>
-					<xsd:attribute name="extract-reply-payload" type="xsd:string" default="true"/>
-					<xsd:attribute name="request-channel" type="xsd:string" use="required">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="request-timeout" type="xsd:string"/>
-					<xsd:attribute name="reply-timeout" type="xsd:string"/>
-					<xsd:attribute name="transaction-manager" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.transaction.PlatformTransactionManager"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="concurrent-consumers" type="xsd:string"/>
-					<xsd:attribute name="max-concurrent-consumers" type="xsd:string"/>
-					<xsd:attribute name="max-messages-per-task" type="xsd:string"/>
-					<xsd:attribute name="idle-task-execution-limit" type="xsd:string"/>
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="outbound-gateway">
-		<xsd:annotation>
-			<xsd:documentation>
-	Defines an outbound JMS-based Messaging Gateway.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
-			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:ID"/>
-			<xsd:attribute name="request-channel" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="reply-channel" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="request-timeout" type="xsd:string"/>
-			<xsd:attribute name="reply-timeout" type="xsd:string"/>
-			<xsd:attribute name="request-destination" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="javax.jms.Destination"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="request-destination-name" type="xsd:string"/>
-			<xsd:attribute name="reply-destination" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="javax.jms.Destination"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="reply-destination-name" type="xsd:string"/>
-			<xsd:attribute name="destination-resolver" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.jms.support.destination.DestinationResolver"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="pub-sub-domain" type="xsd:string"/>
-			<xsd:attribute name="connection-factory" type="xsd:string" default="connectionFactory">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="javax.jms.ConnectionFactory"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="message-converter" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.jms.support.converter.MessageConverter"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="header-mapper" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.jms.JmsHeaderMapper"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="extract-request-payload" type="xsd:string" default="true"/>
-			<xsd:attribute name="extract-reply-payload" type="xsd:string" default="true"/>
-			<xsd:attribute name="receive-timeout" type="xsd:string"/>
-			<xsd:attribute name="delivery-mode" type="xsd:string"/>
-			<xsd:attribute name="time-to-live" type="xsd:string"/>
-			<xsd:attribute name="priority" type="xsd:string"/>
-			<xsd:attribute name="auto-startup" type="xsd:string" default="true"/>
-			<xsd:attribute name="order" type="xsd:string">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Specifies the order for invocation when this gateway is connected as a
-	subscriber to a SubscribableChannel.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="outbound-channel-adapter">
-		<xsd:annotation>
-			<xsd:documentation>
-	Defines an outbound JMS Message-sending Channel Adapter.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="jmsAdapterType">
-					<xsd:sequence>
-						<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
-					</xsd:sequence>
-					<xsd:attribute name="destination" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="javax.jms.Destination"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="destination-name" type="xsd:string"/>
-					<xsd:attribute name="channel" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="header-mapper" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.jms.JmsHeaderMapper"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="extract-payload" type="xsd:string" default="true"/>
-					<xsd:attribute name="jms-template" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.jms.core.JmsTemplate"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="order" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
-	Specifies the order for invocation when this adapter is connected as a
-	subscriber to a SubscribableChannel.
-							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:complexType name="jmsMessageDrivenInboundAdapterType">
-		<xsd:annotation>
-			<xsd:documentation>
-	Common configuration for message-driven inbound JMS-based adapters.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="jmsInboundAdapterType">
-				<xsd:attribute name="container" type="xsd:string">
-					<xsd:annotation>
-						<xsd:appinfo>
-							<tool:annotation kind="ref">
-								<tool:expected-type type="org.springframework.jms.listener.AbstractMessageListenerContainer"/>
-							</tool:annotation>
-						</xsd:appinfo>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="jmsInboundAdapterType">
-		<xsd:annotation>
-			<xsd:documentation>
-	Common configuration for inbound JMS-based adapters.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="jmsAdapterType">
-				<xsd:attribute name="acknowledge" default="auto">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-	The native JMS acknowledge mode: "auto", "client", "dups-ok" or "transacted".
-	The latter effectively activates a locally transacted Session.
-						]]></xsd:documentation>
-					</xsd:annotation>
-					<xsd:simpleType>
-						<xsd:restriction base="xsd:NMTOKEN">
-							<xsd:enumeration value="auto"/>
-							<xsd:enumeration value="client"/>
-							<xsd:enumeration value="dups-ok"/>
-							<xsd:enumeration value="transacted"/>
-						</xsd:restriction>
-					</xsd:simpleType>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:element name="header-enricher">
-		<xsd:complexType>
-			<xsd:annotation>
-				<xsd:documentation>
-	Defines a Transformer for adding statically configured JMS Headers.
-				</xsd:documentation>
-			</xsd:annotation>
-			<xsd:complexContent>
-				<xsd:extension base="transformerType">
-					<xsd:attribute name="correlation-id" type="xsd:string"/>
-					<xsd:attribute name="reply-to" type="xsd:string"/>
-					<xsd:attribute name="overwrite" type="xsd:string"/>
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:complexType name="jmsAdapterType">
-		<xsd:annotation>
-			<xsd:documentation>
-	Common configuration for JMS-based adapters.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:attribute name="id" type="xsd:ID"/>
-		<xsd:attribute name="connection-factory" type="xsd:string">
-			<xsd:annotation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref">
-						<tool:expected-type type="javax.jms.ConnectionFactory"/>
-					</tool:annotation>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="destination-resolver" type="xsd:string">
-			<xsd:annotation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref">
-						<tool:expected-type type="org.springframework.jms.support.destination.DestinationResolver"/>
-					</tool:annotation>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="pub-sub-domain" type="xsd:string"/>
-		<xsd:attribute name="auto-startup" type="xsd:string" default="true"/>
-	</xsd:complexType>
-
-	<xsd:complexType name="transformerType">
-		<xsd:attribute name="id" type="xsd:ID"/>
-		<xsd:attribute name="input-channel" type="xsd:string">
-			<xsd:annotation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref">
-						<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
-					</tool:annotation>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="output-channel" type="xsd:string">
-			<xsd:annotation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref">
-						<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
-					</tool:annotation>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/org.springframework.integration.jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.0.xsd b/org.springframework.integration.jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.0.xsd
deleted file mode 100644
index 7456e97f93..0000000000
--- a/org.springframework.integration.jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.0.xsd
+++ /dev/null
@@ -1,620 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.springframework.org/schema/integration/jms"
-		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-		xmlns:beans="http://www.springframework.org/schema/beans"
-		xmlns:tool="http://www.springframework.org/schema/tool"
-		xmlns:integration="http://www.springframework.org/schema/integration"
-		targetNamespace="http://www.springframework.org/schema/integration/jms"
-		elementFormDefault="qualified"
-		attributeFormDefault="unqualified">
-
-	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
-	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
-	<xsd:import namespace="http://www.springframework.org/schema/integration"
-			schemaLocation="http://www.springframework.org/schema/integration/spring-integration-2.0.xsd"/>
-
-	<xsd:annotation>
-		<xsd:documentation><![CDATA[
-	Defines the configuration elements for Spring Integration's JMS adapters.
-		]]></xsd:documentation>
-	</xsd:annotation>
-
-	<xsd:element name="channel">
-		<xsd:annotation>
-			<xsd:documentation>
-	Defines a Message Channel that is backed by a JMS Queue.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="channelType">
-					<xsd:attribute name="queue" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>
-	Reference to a JMS Queue. Either this attribute or the 'queue-name'
-	must be provided, but only one.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="queue-name" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>
-	Name of a JMS Queue to be resolved by this channel's DestinationResolver.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="publish-subscribe-channel">
-		<xsd:annotation>
-			<xsd:documentation>
-	Defines a Message Channel that is backed by a JMS Topic.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="channelType">
-					<xsd:attribute name="topic" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>
-	Reference to a JMS Topic. Either this attribute or the 'topic-name'
-	must be provided, but only one.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="topic-name" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>
-	Name of a JMS Topic to be resolved by this channel's DestinationResolver.
-							</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:complexType name="channelType">
-		<xsd:attribute name="id" type="xsd:ID" use="required">
-			<xsd:annotation>
-				<xsd:documentation>
-	ID for this channel. Required.
-				</xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="connection-factory" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation>
-	Reference to a JMS ConnectionFactory. If none is provided, the default
-	bean name for the reference will be "connectionFactory".
-				</xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="destination-resolver" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation>
-	Reference to a DestinationResolver. If none is provided, the default will
-	be a DynamicDestinationResolver.
-				</xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:element name="message-driven-channel-adapter">
-		<xsd:annotation>
-			<xsd:documentation>
-	Defines a JMS Message-Driven inbound Channel Adapter.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="jmsMessageDrivenInboundAdapterType">
-					<xsd:attribute name="destination" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="javax.jms.Destination"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="destination-name" type="xsd:string"/>
-					<xsd:attribute name="channel" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="header-mapper" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.jms.JmsHeaderMapper"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="extract-payload" type="xsd:string" default="true"/>
-					<xsd:attribute name="send-timeout" type="xsd:string"/>
-					<xsd:attribute name="transaction-manager" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.transaction.PlatformTransactionManager"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="concurrent-consumers" type="xsd:string"/>
-					<xsd:attribute name="max-concurrent-consumers" type="xsd:string"/>
-					<xsd:attribute name="max-messages-per-task" type="xsd:string"/>
-					<xsd:attribute name="idle-task-execution-limit" type="xsd:string"/>
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="inbound-channel-adapter">
-		<xsd:annotation>
-			<xsd:documentation>
-	Defines an inbound Channel Adapter for polling a JMS Destination.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="jmsInboundAdapterType">
-					<xsd:sequence>
-						<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
-					</xsd:sequence>
-					<xsd:attribute name="destination" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="javax.jms.Destination"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="destination-name" type="xsd:string"/>
-					<xsd:attribute name="channel" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="header-mapper" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.jms.JmsHeaderMapper"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="extract-payload" type="xsd:string" default="true"/>
-					<xsd:attribute name="jms-template" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.jms.core.JmsTemplate"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="inbound-gateway">
-		<xsd:annotation>
-			<xsd:documentation>
-	Defines an inbound JMS-based Messaging Gateway.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="jmsMessageDrivenInboundAdapterType">
-					<xsd:attribute name="request-destination" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="javax.jms.Destination"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="request-destination-name" type="xsd:string"/>
-					<xsd:attribute name="default-reply-destination" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="javax.jms.Destination"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="default-reply-queue-name" type="xsd:string"/>
-					<xsd:attribute name="default-reply-topic-name" type="xsd:string"/>
-					<xsd:attribute name="header-mapper" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.jms.JmsHeaderMapper"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="extract-request-payload" type="xsd:string" default="true"/>
-					<xsd:attribute name="extract-reply-payload" type="xsd:string" default="true"/>
-					<xsd:attribute name="request-channel" type="xsd:string" use="required">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="request-timeout" type="xsd:string"/>
-					<xsd:attribute name="reply-timeout" type="xsd:string"/>
-					<xsd:attribute name="transaction-manager" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.transaction.PlatformTransactionManager"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="concurrent-consumers" type="xsd:string"/>
-					<xsd:attribute name="max-concurrent-consumers" type="xsd:string"/>
-					<xsd:attribute name="max-messages-per-task" type="xsd:string"/>
-					<xsd:attribute name="idle-task-execution-limit" type="xsd:string"/>
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="outbound-gateway">
-		<xsd:annotation>
-			<xsd:documentation>
-	Defines an outbound JMS-based Messaging Gateway.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
-			</xsd:sequence>
-			<xsd:attribute name="id" type="xsd:ID"/>
-			<xsd:attribute name="request-channel" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="reply-channel" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="request-timeout" type="xsd:string"/>
-			<xsd:attribute name="reply-timeout" type="xsd:string"/>
-			<xsd:attribute name="request-destination" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="javax.jms.Destination"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="request-destination-name" type="xsd:string"/>
-			<xsd:attribute name="reply-destination" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="javax.jms.Destination"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="reply-destination-name" type="xsd:string"/>
-			<xsd:attribute name="destination-resolver" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.jms.support.destination.DestinationResolver"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="pub-sub-domain" type="xsd:string"/>
-			<xsd:attribute name="connection-factory" type="xsd:string" default="connectionFactory">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="javax.jms.ConnectionFactory"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="message-converter" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.jms.support.converter.MessageConverter"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="header-mapper" type="xsd:string">
-				<xsd:annotation>
-					<xsd:appinfo>
-						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.integration.jms.JmsHeaderMapper"/>
-						</tool:annotation>
-					</xsd:appinfo>
-				</xsd:annotation>
-			</xsd:attribute>
-			<xsd:attribute name="extract-request-payload" type="xsd:string" default="true"/>
-			<xsd:attribute name="extract-reply-payload" type="xsd:string" default="true"/>
-			<xsd:attribute name="receive-timeout" type="xsd:string"/>
-			<xsd:attribute name="delivery-mode" type="xsd:string"/>
-			<xsd:attribute name="time-to-live" type="xsd:string"/>
-			<xsd:attribute name="priority" type="xsd:string"/>
-			<xsd:attribute name="auto-startup" type="xsd:string" default="true"/>
-			<xsd:attribute name="order" type="xsd:string">
-				<xsd:annotation>
-					<xsd:documentation><![CDATA[
-	Specifies the order for invocation when this gateway is connected as a
-	subscriber to a SubscribableChannel.
-					]]></xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="outbound-channel-adapter">
-		<xsd:annotation>
-			<xsd:documentation>
-	Defines an outbound JMS Message-sending Channel Adapter.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="jmsAdapterType">
-					<xsd:sequence>
-						<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
-					</xsd:sequence>
-					<xsd:attribute name="destination" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="javax.jms.Destination"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="destination-name" type="xsd:string"/>
-					<xsd:attribute name="channel" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="header-mapper" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.integration.jms.JmsHeaderMapper"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="extract-payload" type="xsd:string" default="true"/>
-					<xsd:attribute name="jms-template" type="xsd:string">
-						<xsd:annotation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.jms.core.JmsTemplate"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-					<xsd:attribute name="order" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation><![CDATA[
-	Specifies the order for invocation when this adapter is connected as a
-	subscriber to a SubscribableChannel.
-							]]></xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:complexType name="jmsMessageDrivenInboundAdapterType">
-		<xsd:annotation>
-			<xsd:documentation>
-	Common configuration for message-driven inbound JMS-based adapters.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="jmsInboundAdapterType">
-				<xsd:attribute name="container" type="xsd:string">
-					<xsd:annotation>
-						<xsd:appinfo>
-							<tool:annotation kind="ref">
-								<tool:expected-type type="org.springframework.jms.listener.AbstractMessageListenerContainer"/>
-							</tool:annotation>
-						</xsd:appinfo>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="jmsInboundAdapterType">
-		<xsd:annotation>
-			<xsd:documentation>
-	Common configuration for inbound JMS-based adapters.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="jmsAdapterType">
-				<xsd:attribute name="acknowledge" default="auto">
-					<xsd:annotation>
-						<xsd:documentation><![CDATA[
-	The native JMS acknowledge mode: "auto", "client", "dups-ok" or "transacted".
-	The latter effectively activates a locally transacted Session.
-						]]></xsd:documentation>
-					</xsd:annotation>
-					<xsd:simpleType>
-						<xsd:restriction base="xsd:NMTOKEN">
-							<xsd:enumeration value="auto"/>
-							<xsd:enumeration value="client"/>
-							<xsd:enumeration value="dups-ok"/>
-							<xsd:enumeration value="transacted"/>
-						</xsd:restriction>
-					</xsd:simpleType>
-				</xsd:attribute>
-				<xsd:attribute name="selector" type="xsd:string">
-					<xsd:annotation>
-						<xsd:documentation>
-	A JMS Message Selector expression.
-						</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:element name="header-enricher">
-		<xsd:complexType>
-			<xsd:annotation>
-				<xsd:documentation>
-	Defines a Transformer for adding statically configured JMS Headers.
-				</xsd:documentation>
-			</xsd:annotation>
-			<xsd:complexContent>
-				<xsd:extension base="transformerType">
-					<xsd:choice minOccurs="1" maxOccurs="unbounded">
-						<xsd:element name="reply-to" type="refOnlyHeaderType">
-							<xsd:annotation>
-								<xsd:documentation>
-	The ReplyTo Destination for the JMS Message.
-								</xsd:documentation>
-							</xsd:annotation>
-						</xsd:element>
-						<xsd:element name="correlation-id" type="refOrValueHeaderType">
-							<xsd:annotation>
-								<xsd:documentation>
-	The Correlation ID for the JMS Message.
-								</xsd:documentation>
-							</xsd:annotation>
-						</xsd:element>
-					</xsd:choice>
-					<!-- 
-					<xsd:attribute name="overwrite" type="xsd:string"/>
-					-->
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:complexType name="refOrValueHeaderType">
-		<xsd:complexContent>
-			<xsd:extension base="refOnlyHeaderType">
-				<xsd:attribute name="value" type="xsd:string" />
-				<!-- xsd:attribute name="expression" type="xsd:string" / -->
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="refOnlyHeaderType">
-		<xsd:attribute name="ref" type="xsd:string" />
-		<!-- TODO add 'overwrite' -->
-	</xsd:complexType>
-
-	<xsd:complexType name="jmsAdapterType">
-		<xsd:annotation>
-			<xsd:documentation>
-	Common configuration for JMS-based adapters.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:attribute name="id" type="xsd:ID"/>
-		<xsd:attribute name="connection-factory" type="xsd:string">
-			<xsd:annotation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref">
-						<tool:expected-type type="javax.jms.ConnectionFactory"/>
-					</tool:annotation>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="destination-resolver" type="xsd:string">
-			<xsd:annotation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref">
-						<tool:expected-type type="org.springframework.jms.support.destination.DestinationResolver"/>
-					</tool:annotation>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="message-converter" type="xsd:string">
-			<xsd:annotation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref">
-						<tool:expected-type type="org.springframework.jms.support.converter.MessageConverter"/>
-					</tool:annotation>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="pub-sub-domain" type="xsd:string"/>
-		<xsd:attribute name="auto-startup" type="xsd:string" default="true"/>
-	</xsd:complexType>
-
-	<xsd:complexType name="transformerType">
-		<xsd:attribute name="id" type="xsd:ID"/>
-		<xsd:attribute name="input-channel" type="xsd:string">
-			<xsd:annotation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref">
-						<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
-					</tool:annotation>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="output-channel" type="xsd:string">
-			<xsd:annotation>
-				<xsd:appinfo>
-					<tool:annotation kind="ref">
-						<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
-					</tool:annotation>
-				</xsd:appinfo>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/org.springframework.integration.jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms.gif b/org.springframework.integration.jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms.gif
deleted file mode 100644
index 03bc8fc821..0000000000
Binary files a/org.springframework.integration.jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms.gif and /dev/null differ