updated to spring 3.1.0.RC1

Fixed a problem with proxied channels

src/main/java/org/springframework/integration/flow/Flow.java

@@ -70,7 +70,7 @@ public class Flow implements InitializingBean, BeanNameAware, ChannelResolver, A
 
 	private volatile ChannelResolver flowChannelResolver;
 
-	private volatile PublishSubscribeChannel flowOutputChannel;
+	private volatile SubscribableChannel flowOutputChannel;
 
 	private volatile boolean help;
 
@@ -211,7 +211,7 @@ public class Flow implements InitializingBean, BeanNameAware, ChannelResolver, A
 	 * a single PublishSubscribeChannel
 	 * @return the publish-subscribe channel
 	 */
-	public PublishSubscribeChannel getFlowOutputChannel() {
+	public SubscribableChannel getFlowOutputChannel() {
 		return flowOutputChannel;
 	}
 
@@ -220,8 +220,8 @@ public class Flow implements InitializingBean, BeanNameAware, ChannelResolver, A
 	 * a single PublishSubscribeChannel
 	 * @param the publish-subscribe channel
 	 */
-	public void setFlowOutputChannel(PublishSubscribeChannel flowOutputChannel) {
-		this.flowOutputChannel = flowOutputChannel;
+	public void setFlowOutputChannel(SubscribableChannel flowOutputChannel) {
+		this.flowOutputChannel =  flowOutputChannel;
 	}
 
 	@Override

src/test/java/org/springframework/integration/flow/config/xml/FlowContextTest.java

@@ -32,4 +32,12 @@ public class FlowContextTest {
 		  throw e;
 	  }
 	}
+	
+	@Test 
+	public void testFlowWithJMX() {
+	  
+		new ClassPathXmlApplicationContext("/FlowContextWithJMXTest-context.xml");
+	  
+	}
+ 
 }

src/test/resources/FlowContextTest-context.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:int="http://www.springframework.org/schema/integration"
-	xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:int="http://www.springframework.org/schema/integration"
+    xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
+    xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
 		http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
+ 
 	<!-- Instantiate the flow -->
 	<int-flow:flow id="subflow" flow-id="flow-with-channel-conflict"/>