diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..abbe282
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+target
+.settings
diff --git a/.settings/com.springsource.sts.config.flow.prefs b/.settings/com.springsource.sts.config.flow.prefs
deleted file mode 100644
index 6ad5ae5..0000000
--- a/.settings/com.springsource.sts.config.flow.prefs
+++ /dev/null
@@ -1,30 +0,0 @@
-#Thu Jun 30 08:13:21 EDT 2011
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/cic-subflows/src/test/resources/FlowConfigTest-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1409" endstart\="1409" start\="1379" startend\="1409"/>\n<bounds height\="124" width\="124" x\="19" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1484" endstart\="1470" start\="1417" startend\="1447"/>\n<bounds height\="124" width\="124" x\="19" y\="161"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/cic-subflows/src/test/resources/META-INF/spring/subflows/test-subflow-1-config.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="HeaderEnricherModelElement" type\="header-enricher">\n<structure end\="618" endstart\="596" start\="491" startend\="542"/>\n<bounds height\="124" width\="124" x\="163" y\="17"/>\n</element>\n<element clazz\="ImplicitChannelModelElement" type\="channel">\n<structure end\="618" endstart\="596" start\="491" startend\="542"/>\n<bounds height\="124" width\="124" x\="19" y\="17"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/cic-subflows/src/test/resources/META-INF/spring/subflows/test-subflow-2-config.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="HeaderEnricherModelElement" type\="header-enricher">\n<structure end\="614" endstart\="592" start\="487" startend\="538"/>\n<bounds height\="124" width\="124" x\="163" y\="17"/>\n</element>\n<element clazz\="ImplicitChannelModelElement" type\="channel">\n<structure end\="614" endstart\="592" start\="487" startend\="538"/>\n<bounds height\="124" width\="124" x\="19" y\="17"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/cic-subflows/src/test/resources/META-INF/spring/subflows/test-subflow-3-config.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="HeaderEnricherModelElement" type\="header-enricher">\n<structure end\="615" endstart\="593" start\="488" startend\="539"/>\n<bounds height\="124" width\="124" x\="163" y\="17"/>\n</element>\n<element clazz\="ImplicitChannelModelElement" type\="channel">\n<structure end\="615" endstart\="593" start\="488" startend\="539"/>\n<bounds height\="124" width\="124" x\="19" y\="17"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/cic-subflows/src/test/resources/SubFlow1-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="HeaderEnricherModelElement" type\="header-enricher">\n<structure end\="1173" endstart\="1151" start\="1026" startend\="1109"/>\n<bounds height\="124" width\="124" x\="163" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1211" endstart\="1211" start\="1177" startend\="1211"/>\n<bounds height\="124" width\="124" x\="307" y\="17"/>\n</element>\n<element clazz\="ImplicitChannelModelElement" type\="channel">\n<structure end\="1173" endstart\="1151" start\="1026" startend\="1109"/>\n<bounds height\="124" width\="124" x\="19" y\="17"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/cic-subflows/src/test/resources/SubFlowConfigTest-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1431" endstart\="1431" start\="1406" startend\="1431"/>\n<bounds height\="124" width\="124" x\="19" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1510" endstart\="1496" start\="1448" startend\="1473"/>\n<bounds height\="124" width\="124" x\="19" y\="161"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/cic-subflows/src/test/resources/SubFlowTest-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChainModelElement" type\="chain">\n<structure end\="892" endstart\="880" start\="489" startend\="546"/>\n<bounds height\="124" width\="124" x\="163" y\="159"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="961" endstart\="947" start\="900" startend\="925"/>\n<bounds height\="124" width\="124" x\="307" y\="207"/>\n</element>\n<element clazz\="ImplicitChannelModelElement" type\="channel">\n<structure end\="892" endstart\="880" start\="489" startend\="546"/>\n<bounds height\="124" width\="124" x\="19" y\="159"/>\n</element>\n<element clazz\="ChainContainerElement" type\="chain">\n<structure end\="892" endstart\="880" start\="489" startend\="546"/>\n<bounds height\="178" width\="423" x\="307" y\="15"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/spring-integration-cic/src/test/resources/META-INF/spring/subflows/test-subflow-config.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="519" endstart\="519" start\="486" startend\="519"/>\n<bounds height\="124" width\="124" x\="19" y\="17"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/spring-integration-cic/src/test/resources/NamespaceTest-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChainModelElement" type\="chain">\n<structure end\="660" endstart\="648" start\="481" startend\="533"/>\n<bounds height\="124" width\="124" x\="163" y\="159"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="687" endstart\="687" start\="664" startend\="687"/>\n<bounds height\="124" width\="124" x\="307" y\="207"/>\n</element>\n<element clazz\="ImplicitChannelModelElement" type\="channel">\n<structure end\="660" endstart\="648" start\="481" startend\="533"/>\n<bounds height\="124" width\="124" x\="19" y\="159"/>\n</element>\n<element clazz\="ChainContainerElement" type\="chain">\n<structure end\="660" endstart\="648" start\="481" startend\="533"/>\n<bounds height\="178" width\="279" x\="307" y\="15"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/spring-integration-cic/src/test/resources/SubFlow1-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="HeaderEnricherModelElement" type\="header-enricher">\n<structure end\="609" endstart\="587" start\="484" startend\="535"/>\n<bounds height\="124" width\="124" x\="163" y\="17"/>\n</element>\n<element clazz\="ImplicitChannelModelElement" type\="channel">\n<structure end\="609" endstart\="587" start\="484" startend\="535"/>\n<bounds height\="124" width\="124" x\="19" y\="17"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/spring-integration-cic/src/test/resources/SubFlow2-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="HeaderEnricherModelElement" type\="header-enricher">\n<structure end\="609" endstart\="587" start\="484" startend\="535"/>\n<bounds height\="124" width\="124" x\="163" y\="17"/>\n</element>\n<element clazz\="ImplicitChannelModelElement" type\="channel">\n<structure end\="609" endstart\="587" start\="484" startend\="535"/>\n<bounds height\="124" width\="124" x\="19" y\="17"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/spring-integration-cic/src/test/resources/SubFlowTest-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChainModelElement" type\="chain">\n<structure end\="717" endstart\="705" start\="483" startend\="540"/>\n<bounds height\="124" width\="124" x\="163" y\="159"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="786" endstart\="772" start\="725" startend\="750"/>\n<bounds height\="124" width\="124" x\="307" y\="207"/>\n</element>\n<element clazz\="ImplicitChannelModelElement" type\="channel">\n<structure end\="717" endstart\="705" start\="483" startend\="540"/>\n<bounds height\="124" width\="124" x\="19" y\="159"/>\n</element>\n<element clazz\="ChainContainerElement" type\="chain">\n<structure end\="717" endstart\="705" start\="483" startend\="540"/>\n<bounds height\="178" width\="423" x\="307" y\="15"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/spring-integration-flow/src/test/resources/FlowClientNamespace2Test-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1028" endstart\="1014" start\="971" startend\="997"/>\n<bounds height\="124" width\="124" x\="19" y\="17"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/spring-integration-flow/src/test/resources/FlowClientNamespaceTest-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChainModelElement" type\="chain">\n<structure end\="1126" endstart\="1114" start\="953" startend\="1029"/>\n<bounds height\="124" width\="124" x\="163" y\="86"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1201" endstart\="1187" start\="1136" startend\="1169"/>\n<bounds height\="124" width\="124" x\="19" y\="207"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1272" endstart\="1258" start\="1206" startend\="1240"/>\n<bounds height\="124" width\="124" x\="307" y\="207"/>\n</element>\n<element clazz\="ImplicitChannelModelElement" type\="channel">\n<structure end\="1126" endstart\="1114" start\="953" startend\="1029"/>\n<bounds height\="124" width\="124" x\="19" y\="63"/>\n</element>\n<element clazz\="ChainContainerElement" type\="chain">\n<structure end\="1126" endstart\="1114" start\="953" startend\="1029"/>\n<bounds height\="178" width\="279" x\="307" y\="15"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/spring-integration-flow/src/test/resources/FlowConfigTest-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1399" endstart\="1399" start\="1369" startend\="1399"/>\n<bounds height\="124" width\="124" x\="19" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1474" endstart\="1460" start\="1407" startend\="1437"/>\n<bounds height\="124" width\="124" x\="19" y\="161"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/spring-integration-flow/src/test/resources/FlowWithErrorTest-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1237" endstart\="1223" start\="1180" startend\="1206"/>\n<bounds height\="124" width\="124" x\="19" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1299" endstart\="1285" start\="1241" startend\="1268"/>\n<bounds height\="124" width\="124" x\="19" y\="161"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/spring-integration-flow/src/test/resources/FlowWithMissingReferencesTest-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph/>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/spring-integration-flow/src/test/resources/FlowWithReferencedBeanTest-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1277" endstart\="1263" start\="1220" startend\="1246"/>\n<bounds height\="124" width\="124" x\="19" y\="17"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/spring-integration-flow/src/test/resources/FlowWithReferencesTest-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1305" endstart\="1291" start\="1248" startend\="1274"/>\n<bounds height\="124" width\="124" x\="19" y\="17"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/spring-integration-flow/src/test/resources/META-INF/spring/integration/flows/subflow1-bean-config.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="2511" endstart\="2511" start\="2478" startend\="2511"/>\n<bounds height\="124" width\="124" x\="19" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="2550" endstart\="2550" start\="2516" startend\="2550"/>\n<bounds height\="124" width\="124" x\="19" y\="161"/>\n</element>\n<element clazz\="HeaderEnricherModelElement" type\="header-enricher">\n<structure end\="2703" endstart\="2681" start\="2554" startend\="2639"/>\n<bounds height\="124" width\="124" x\="163" y\="17"/>\n</element>\n<element clazz\="HeaderEnricherModelElement" type\="header-enricher">\n<structure end\="2864" endstart\="2842" start\="2707" startend\="2794"/>\n<bounds height\="124" width\="124" x\="163" y\="161"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="2902" endstart\="2902" start\="2867" startend\="2902"/>\n<bounds height\="124" width\="124" x\="307" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="2940" endstart\="2940" start\="2904" startend\="2940"/>\n<bounds height\="124" width\="124" x\="307" y\="161"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/spring-integration-flow/src/test/resources/META-INF/spring/integration/flows/subflow1-context-new.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="HeaderEnricherModelElement" type\="header-enricher">\n<structure end\="1168" endstart\="1146" start\="1021" startend\="1104"/>\n<bounds height\="124" width\="124" x\="163" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1206" endstart\="1206" start\="1172" startend\="1206"/>\n<bounds height\="124" width\="124" x\="307" y\="17"/>\n</element>\n<element clazz\="ImplicitChannelModelElement" type\="channel">\n<structure end\="1168" endstart\="1146" start\="1021" startend\="1104"/>\n<bounds height\="124" width\="124" x\="19" y\="17"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/spring-integration-flow/src/test/resources/META-INF/spring/integration/flows/subflow1-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1469" endstart\="1469" start\="1435" startend\="1469"/>\n<bounds height\="124" width\="124" x\="19" y\="17"/>\n</element>\n<element clazz\="HeaderEnricherModelElement" type\="header-enricher">\n<structure end\="1628" endstart\="1606" start\="1473" startend\="1558"/>\n<bounds height\="124" width\="124" x\="163" y\="17"/>\n</element>\n<element clazz\="RouterModelElement" type\="router">\n<structure end\="1706" endstart\="1706" start\="1631" startend\="1706"/>\n<bounds height\="124" width\="124" x\="451" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1742" endstart\="1742" start\="1709" startend\="1742"/>\n<bounds height\="124" width\="124" x\="19" y\="161"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1777" endstart\="1777" start\="1744" startend\="1777"/>\n<bounds height\="124" width\="124" x\="19" y\="305"/>\n</element>\n<element clazz\="ImplicitChannelModelElement" type\="channel">\n<structure end\="1706" endstart\="1706" start\="1631" startend\="1706"/>\n<bounds height\="124" width\="124" x\="307" y\="17"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/spring-integration-flow/src/test/resources/META-INF/spring/integration/flows/subflow2-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1535" endstart\="1535" start\="1500" startend\="1535"/>\n<bounds height\="124" width\="124" x\="307" y\="17"/>\n</element>\n<element clazz\="HeaderEnricherModelElement" type\="header-enricher">\n<structure end\="1832" endstart\="1810" start\="1538" startend\="1623"/>\n<bounds height\="124" width\="124" x\="163" y\="17"/>\n</element>\n<element clazz\="ImplicitChannelModelElement" type\="channel">\n<structure end\="1832" endstart\="1810" start\="1538" startend\="1623"/>\n<bounds height\="124" width\="124" x\="19" y\="17"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/spring-integration-flow/src/test/resources/META-INF/spring/integration/flows/subflow3-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="2095" endstart\="2095" start\="2060" startend\="2095"/>\n<bounds height\="124" width\="124" x\="19" y\="17"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/spring-integration-flow/src/test/resources/META-INF/spring/integration/flows/subflow4-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ServiceActivatorModelElement" type\="service-activator">\n<structure end\="1778" endstart\="1754" start\="1568" startend\="1672"/>\n<bounds height\="124" width\="124" x\="163" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1818" endstart\="1818" start\="1784" startend\="1818"/>\n<bounds height\="124" width\="124" x\="307" y\="17"/>\n</element>\n<element clazz\="ImplicitChannelModelElement" type\="channel">\n<structure end\="1778" endstart\="1754" start\="1568" startend\="1672"/>\n<bounds height\="124" width\="124" x\="19" y\="17"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/spring-integration-flow/src/test/resources/META-INF/spring/integration/flows/subflow5-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ServiceActivatorModelElement" type\="service-activator">\n<structure end\="1856" endstart\="1856" start\="1746" startend\="1856"/>\n<bounds height\="124" width\="124" x\="163" y\="17"/>\n</element>\n<element clazz\="GatewayModelElement" type\="gateway">\n<structure end\="1991" endstart\="1991" start\="1859" startend\="1991"/>\n<bounds height\="124" width\="124" x\="19" y\="161"/>\n</element>\n<element clazz\="ServiceActivatorModelElement" type\="service-activator">\n<structure end\="2177" endstart\="2153" start\="1996" startend\="2071"/>\n<bounds height\="124" width\="124" x\="307" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="2220" endstart\="2220" start\="2186" startend\="2220"/>\n<bounds height\="124" width\="124" x\="307" y\="161"/>\n</element>\n<element clazz\="ImplicitChannelModelElement" type\="channel">\n<structure end\="1856" endstart\="1856" start\="1746" startend\="1856"/>\n<bounds height\="124" width\="124" x\="19" y\="17"/>\n</element>\n<element clazz\="ImplicitChannelModelElement" type\="channel">\n<structure end\="2177" endstart\="2153" start\="1996" startend\="2071"/>\n<bounds height\="124" width\="124" x\="163" y\="161"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/spring-integration-flow/src/test/resources/MultiBridgeTest-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="BridgeModelElement" type\="bridge">\n<structure end\="535" endstart\="535" start\="474" startend\="535"/>\n<bounds height\="124" width\="124" x\="163" y\="17"/>\n</element>\n<element clazz\="BridgeModelElement" type\="bridge">\n<structure end\="598" endstart\="598" start\="537" startend\="598"/>\n<bounds height\="124" width\="124" x\="163" y\="161"/>\n</element>\n<element clazz\="BridgeModelElement" type\="bridge">\n<structure end\="661" endstart\="661" start\="600" startend\="661"/>\n<bounds height\="124" width\="124" x\="163" y\="305"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="903" endstart\="889" start\="664" startend\="689"/>\n<bounds height\="124" width\="124" x\="19" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1146" endstart\="1132" start\="907" startend\="932"/>\n<bounds height\="124" width\="124" x\="19" y\="161"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1389" endstart\="1375" start\="1150" startend\="1175"/>\n<bounds height\="124" width\="124" x\="19" y\="305"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1448" endstart\="1434" start\="1392" startend\="1417"/>\n<bounds height\="124" width\="124" x\="307" y\="161"/>\n</element>\n</graph>
-//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/integration\:/spring-integration-flow/src/test/resources/NamespaceTest-context.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1113" endstart\="1113" start\="1083" startend\="1113"/>\n<bounds height\="124" width\="124" x\="19" y\="17"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1178" endstart\="1164" start\="1116" startend\="1146"/>\n<bounds height\="124" width\="124" x\="19" y\="161"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1431" endstart\="1431" start\="1397" startend\="1431"/>\n<bounds height\="124" width\="124" x\="19" y\="305"/>\n</element>\n<element clazz\="ChannelModelElement" type\="channel">\n<structure end\="1499" endstart\="1485" start\="1434" startend\="1467"/>\n<bounds height\="124" width\="124" x\="19" y\="449"/>\n</element>\n</graph>
-eclipse.preferences.version=1
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index cc49a65..0000000
--- a/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,77 +0,0 @@
-#Wed Jun 29 17:51:26 EDT 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 81c01f3..0000000
--- a/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="spring-integration-flow">
-        <wb-resource deploy-path="/" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/" source-path="/src/main/resources"/>
-    </wb-module>
-</project-modules>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 5c9bd75..0000000
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <installed facet="jst.utility" version="1.0"/>
-  <installed facet="java" version="1.6"/>
-</faceted-project>
diff --git a/.settings/org.maven.ide.eclipse.prefs b/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 7374e14..0000000
--- a/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue May 24 12:20:41 EDT 2011
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/pom.xml b/pom.xml
index fe93ef9..21ed158 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,8 +147,8 @@
 
 	<repositories>
 		<repository>
-			<id>http://maven.springframework.org/milestone</id>
+			<id>maven_springframework_milestone</id>
 			<url>http://maven.springframework.org/milestone</url>
 		</repository>
 	</repositories>
-</project>
\ No newline at end of file
+</project>