Moved DirectChannel and PublishSubscribeChannels to the 'channel' pacakge.

org.springframework.integration/src/main/java/org/springframework/integration/channel/DirectChannel.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.dispatcher;
+package org.springframework.integration.channel;
 
-import org.springframework.integration.channel.AbstractMessageChannel;
+import org.springframework.integration.dispatcher.SimpleDispatcher;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.SubscribableSource;
 import org.springframework.integration.message.MessageTarget;

org.springframework.integration/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.dispatcher;
+package org.springframework.integration.channel;
 
 import org.springframework.core.task.TaskExecutor;
-import org.springframework.integration.channel.AbstractMessageChannel;
+import org.springframework.integration.dispatcher.BroadcastingDispatcher;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageTarget;
 import org.springframework.integration.message.SubscribableSource;

org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/DirectChannelFactory.java

@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.dispatcher;
+package org.springframework.integration.channel.factory;
 
 import org.springframework.integration.channel.AbstractMessageChannel;
-import org.springframework.integration.channel.factory.AbstractChannelFactory;
-import org.springframework.integration.channel.factory.ChannelFactory;
+import org.springframework.integration.channel.DirectChannel;
 
 /**
  * A {@link ChannelFactory} for creating {@link DirectChannel} instances.

org.springframework.integration/src/main/java/org/springframework/integration/config/DirectChannelParser.java

@@ -18,7 +18,7 @@ package org.springframework.integration.config;
 
 import org.w3c.dom.Element;
 
-import org.springframework.integration.dispatcher.DirectChannel;
+import org.springframework.integration.channel.DirectChannel;
 
 /**
  * Parser for the <direct-channel> element.

org.springframework.integration/src/main/java/org/springframework/integration/config/PublishSubscribeChannelParser.java

@@ -19,7 +19,7 @@ package org.springframework.integration.config;
 import org.w3c.dom.Element;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.integration.dispatcher.PublishSubscribeChannel;
+import org.springframework.integration.channel.PublishSubscribeChannel;
 import org.springframework.util.StringUtils;
 
 /**

org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java

@@ -31,8 +31,8 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.PollableChannel;
 import org.springframework.integration.channel.PollableChannelAdapter;
+import org.springframework.integration.channel.PublishSubscribeChannel;
 import org.springframework.integration.channel.QueueChannel;
-import org.springframework.integration.dispatcher.PublishSubscribeChannel;
 import org.springframework.integration.endpoint.DefaultEndpoint;
 import org.springframework.integration.handler.MessageHandler;
 import org.springframework.integration.message.ErrorMessage;

org.springframework.integration/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java

@@ -23,11 +23,11 @@ import org.junit.Test;
 
 import org.springframework.integration.annotation.Handler;
 import org.springframework.integration.annotation.MessageEndpoint;
+import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.channel.ThreadLocalChannel;
 import org.springframework.integration.config.annotation.MessagingAnnotationPostProcessor;
-import org.springframework.integration.dispatcher.DirectChannel;
 import org.springframework.integration.endpoint.DefaultEndpoint;
 import org.springframework.integration.handler.MessageHandler;
 import org.springframework.integration.message.Message;

org.springframework.integration/src/test/java/org/springframework/integration/channel/DirectChannelParserTests.java

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.dispatcher;
+package org.springframework.integration.channel;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.integration.channel.DirectChannel;
 
 /**
  * @author Mark Fisher

org.springframework.integration/src/test/java/org/springframework/integration/channel/DirectChannelTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.dispatcher;
+package org.springframework.integration.channel;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
 
+import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageTarget;
 import org.springframework.integration.message.StringMessage;

org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java

@@ -32,9 +32,9 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.PollableChannel;
+import org.springframework.integration.channel.PublishSubscribeChannel;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.config.TestChannelInterceptor;
-import org.springframework.integration.dispatcher.PublishSubscribeChannel;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageBuilder;

org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/ChannelFactoryTests.java

@@ -33,6 +33,7 @@ import org.springframework.integration.bus.DefaultChannelFactoryBean;
 import org.springframework.integration.bus.DefaultMessageBus;
 import org.springframework.integration.channel.AbstractMessageChannel;
 import org.springframework.integration.channel.ChannelInterceptor;
+import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.PriorityChannel;
 import org.springframework.integration.channel.QueueChannel;
@@ -40,8 +41,6 @@ import org.springframework.integration.channel.RendezvousChannel;
 import org.springframework.integration.channel.ThreadLocalChannel;
 import org.springframework.integration.channel.config.ChannelParserTests;
 import org.springframework.integration.channel.interceptor.ChannelInterceptorAdapter;
-import org.springframework.integration.dispatcher.DirectChannel;
-import org.springframework.integration.dispatcher.DirectChannelFactory;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageBuilder;
 

org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java

@@ -37,10 +37,10 @@ import org.springframework.integration.bus.MessageBusInterceptorTests;
 import org.springframework.integration.bus.TestMessageBusAwareImpl;
 import org.springframework.integration.bus.TestMessageBusStartInterceptor;
 import org.springframework.integration.bus.TestMessageBusStopInterceptor;
+import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.channel.config.ChannelParserTests;
-import org.springframework.integration.dispatcher.DirectChannel;
 import org.springframework.integration.endpoint.DefaultEndpoint;
 import org.springframework.integration.handler.MessageHandler;
 import org.springframework.integration.handler.TestHandlers;

org.springframework.integration/src/test/java/org/springframework/integration/config/PublishSubscribeChannelParserTests.java

@@ -27,8 +27,8 @@ import org.junit.Test;
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.core.task.TaskExecutor;
+import org.springframework.integration.channel.PublishSubscribeChannel;
 import org.springframework.integration.dispatcher.BroadcastingDispatcher;
-import org.springframework.integration.dispatcher.PublishSubscribeChannel;
 
 /**
  * @author Mark Fisher

org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithChannelFactory.xml

@@ -9,7 +9,7 @@
 
 	<message-bus channel-factory="directChannelFactory"/>
 
-	<beans:bean id="directChannelFactory" class="org.springframework.integration.dispatcher.DirectChannelFactory"/>	
+	<beans:bean id="directChannelFactory" class="org.springframework.integration.channel.factory.DirectChannelFactory"/>	
 
     <channel id="defaultTypeChannel"/>