diff --git a/basic/xml/.settings/com.springsource.sts.config.flow.prefs b/basic/xml/.settings/com.springsource.sts.config.flow.prefs
index eb28a0f5..548fe14d 100644
--- a/basic/xml/.settings/com.springsource.sts.config.flow.prefs
+++ b/basic/xml/.settings/com.springsource.sts.config.flow.prefs
@@ -1,3 +1,3 @@
-#Thu Sep 16 19:13:50 EDT 2010
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/xml/src/main/resources/META-INF/spring/integration/orderProcessingSample.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="885" endstart\="885" start\="852" startend\="885"/>\n<bounds height\="112" width\="116" x\="19" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="926" endstart\="926" start\="887" startend\="926"/>\n<bounds height\="112" width\="116" x\="291" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="967" endstart\="967" start\="928" startend\="967"/>\n<bounds height\="112" width\="116" x\="563" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1013" endstart\="1013" start\="969" startend\="1013"/>\n<bounds height\="112" width\="116" x\="19" y\="149"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1052" endstart\="1052" start\="1015" startend\="1052"/>\n<bounds height\="112" width\="116" x\="19" y\="281"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1094" endstart\="1094" start\="1054" startend\="1094"/>\n<bounds height\="112" width\="116" x\="291" y\="281"/>\n</element>\n<element clazz\="XpathSplitterModelElement" type\="xpath-splitter">\n<structure end\="1696" endstart\="1672" start\="1423" startend\="1560"/>\n<bounds height\="112" width\="116" x\="155" y\="17"/>\n</element>\n<element clazz\="ServiceActivatorModelElement" type\="service-activator">\n<structure end\="1972" endstart\="1949" start\="1723" startend\="1818"/>\n<bounds height\="112" width\="116" x\="427" y\="17"/>\n</element>\n<element clazz\="XpathRouterModelElement" type\="xpath-router">\n<structure end\="2471" endstart\="2449" start\="2196" startend\="2340"/>\n<bounds height\="112" width\="116" x\="699" y\="17"/>\n</element>\n<element clazz\="OutboundChannelAdapterModelElement" type\="outbound-channel-adapter">\n<structure end\="3004" endstart\="2974" start\="2809" startend\="2891"/>\n<bounds height\="112" width\="116" x\="155" y\="149"/>\n</element>\n<element clazz\="XslTransformerModelElement" type\="xslt-transformer">\n<structure end\="3291" endstart\="3291" start\="3103" startend\="3291"/>\n<bounds height\="112" width\="116" x\="155" y\="281"/>\n</element>\n<element clazz\="OutboundChannelAdapterModelElement" type\="outbound-channel-adapter">\n<structure end\="3523" endstart\="3493" start\="3328" startend\="3411"/>\n<bounds height\="112" width\="116" x\="427" y\="281"/>\n</element>\n</graph>
+#Tue Nov 09 07:50:35 EST 2010
+//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/xml/src/main/resources/META-INF/spring/integration/orderProcessingSample.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="893" endstart\="893" start\="860" startend\="893"/>\n<bounds height\="112" width\="116" x\="19" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="934" endstart\="934" start\="895" startend\="934"/>\n<bounds height\="112" width\="116" x\="291" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="975" endstart\="975" start\="936" startend\="975"/>\n<bounds height\="112" width\="116" x\="563" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1021" endstart\="1021" start\="977" startend\="1021"/>\n<bounds height\="112" width\="116" x\="19" y\="149"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1060" endstart\="1060" start\="1023" startend\="1060"/>\n<bounds height\="112" width\="116" x\="19" y\="281"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1102" endstart\="1102" start\="1062" startend\="1102"/>\n<bounds height\="112" width\="116" x\="291" y\="281"/>\n</element>\n<element clazz\="XpathSplitterModelElement" type\="xpath-splitter">\n<structure end\="1704" endstart\="1680" start\="1431" startend\="1568"/>\n<bounds height\="112" width\="116" x\="155" y\="17"/>\n</element>\n<element clazz\="ServiceActivatorModelElement" type\="service-activator">\n<structure end\="1980" endstart\="1957" start\="1731" startend\="1826"/>\n<bounds height\="112" width\="116" x\="427" y\="17"/>\n</element>\n<element clazz\="XpathRouterModelElement" type\="xpath-router">\n<structure end\="2568" endstart\="2546" start\="2204" startend\="2307"/>\n<bounds height\="112" width\="116" x\="699" y\="17"/>\n</element>\n<element clazz\="OutboundChannelAdapterModelElement" type\="outbound-channel-adapter">\n<structure end\="2805" endstart\="2775" start\="2610" startend\="2692"/>\n<bounds height\="112" width\="116" x\="155" y\="149"/>\n</element>\n<element clazz\="XslTransformerModelElement" type\="xslt-transformer">\n<structure end\="3092" endstart\="3092" start\="2904" startend\="3092"/>\n<bounds height\="112" width\="116" x\="155" y\="281"/>\n</element>\n<element clazz\="OutboundChannelAdapterModelElement" type\="outbound-channel-adapter">\n<structure end\="3324" endstart\="3294" start\="3129" startend\="3212"/>\n<bounds height\="112" width\="116" x\="427" y\="281"/>\n</element>\n</graph>
 eclipse.preferences.version=1
diff --git a/basic/xml/src/main/resources/META-INF/spring/integration/orderProcessingSample.xml b/basic/xml/src/main/resources/META-INF/spring/integration/orderProcessingSample.xml
index d8111e6a..9101de97 100644
--- a/basic/xml/src/main/resources/META-INF/spring/integration/orderProcessingSample.xml
+++ b/basic/xml/src/main/resources/META-INF/spring/integration/orderProcessingSample.xml
@@ -6,9 +6,9 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd
+			http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
 			http://www.springframework.org/schema/integration/xml
-			http://www.springframework.org/schema/integration/xml/spring-integration-xml.xsd
+			http://www.springframework.org/schema/integration/xml/spring-integration-xml-2.0.xsd
 			http://www.springframework.org/schema/util
 			http://www.springframework.org/schema/util/spring-util.xsd">
 
@@ -40,20 +40,12 @@
 	<si-xml:xpath-expression id="selectIsbnXpath" namespace-map="orderNamespaceMap" expression="/orderNs:orderItem/orderNs:isbn/text()" />
 
 	<!-- if in stock route to the warehouse else route to the out of stock channel -->
-	<si-xml:xpath-router id="instockRouter" channel-resolver="mapChannelResolver" 
-		input-channel="orderRoutingChannel" resolution-required="true">
+	<si-xml:xpath-router id="instockRouter" input-channel="orderRoutingChannel" resolution-required="true">
 		<si-xml:xpath-expression expression="/orderNs:orderItem/@in-stock" namespace-map="orderNamespaceMap"  />
+		<si-xml:mapping value="true" channel="warehouseDispatchChannel"/>
+		<si-xml:mapping value="false" channel="outOfStockChannel"/>
 	</si-xml:xpath-router>
 	
-	<bean id="mapChannelResolver" class="org.springframework.integration.channel.MapBasedChannelResolver">
-		<property name="channelMap">
-			<map>
-				<entry key="true" value-ref="warehouseDispatchChannel" />
-				<entry key="false" value-ref="outOfStockChannel" />
-			</map>
-		</property>
-	</bean>
-
 	<!--  dispatch order if in stock -->
 	<si:outbound-channel-adapter method="dispatch" channel="warehouseDispatchChannel">
 		<bean class="org.springframework.integration.samples.xml.WarehouseDispatch" />