From c7250f3ea537028cb4b7957ffefb2ec1cedc9d41 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Mon, 7 Jul 2008 01:12:52 +0000 Subject: [PATCH] Moved PublishSubscribeChannel to 'dispatcher' package since it depends on dispatchers (avoids a tangle). Also moved the PublishSubscribeChannelParser into 'config'. --- .../integration/config/IntegrationNamespaceHandler.java | 1 - .../{channel => }/config/PublishSubscribeChannelParser.java | 5 +++-- .../{channel => dispatcher}/PublishSubscribeChannel.java | 5 +++-- .../integration/bus/DefaultMessageBusTests.java | 2 +- .../integration/channel/config/ChannelParserTests.java | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) rename org.springframework.integration/src/main/java/org/springframework/integration/{channel => }/config/PublishSubscribeChannelParser.java (87%) rename org.springframework.integration/src/main/java/org/springframework/integration/{channel => dispatcher}/PublishSubscribeChannel.java (91%) diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java index 2f86077231..5daaf7237d 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java @@ -29,7 +29,6 @@ import org.springframework.beans.factory.xml.BeanDefinitionParser; import org.springframework.beans.factory.xml.NamespaceHandlerSupport; import org.springframework.core.io.support.PropertiesLoaderUtils; import org.springframework.integration.channel.config.PriorityChannelParser; -import org.springframework.integration.channel.config.PublishSubscribeChannelParser; import org.springframework.integration.channel.config.QueueChannelParser; import org.springframework.integration.channel.config.RendezvousChannelParser; import org.springframework.integration.channel.config.ThreadLocalChannelParser; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/PublishSubscribeChannelParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/PublishSubscribeChannelParser.java similarity index 87% rename from org.springframework.integration/src/main/java/org/springframework/integration/channel/config/PublishSubscribeChannelParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/PublishSubscribeChannelParser.java index 1dddfbe49b..ea8841cd92 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/PublishSubscribeChannelParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/PublishSubscribeChannelParser.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package org.springframework.integration.channel.config; +package org.springframework.integration.config; import org.w3c.dom.Element; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.integration.channel.DispatcherPolicy; -import org.springframework.integration.channel.PublishSubscribeChannel; +import org.springframework.integration.channel.config.AbstractChannelParser; +import org.springframework.integration.dispatcher.PublishSubscribeChannel; import org.springframework.util.StringUtils; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PublishSubscribeChannel.java similarity index 91% rename from org.springframework.integration/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java rename to org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PublishSubscribeChannel.java index c2a82abad3..c21f951fc9 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PublishSubscribeChannel.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.integration.channel; +package org.springframework.integration.dispatcher; import java.util.List; import org.springframework.core.task.TaskExecutor; -import org.springframework.integration.dispatcher.BroadcastingDispatcher; +import org.springframework.integration.channel.AbstractMessageChannel; +import org.springframework.integration.channel.DispatcherPolicy; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageTarget; import org.springframework.integration.message.Subscribable; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java index fb06d19977..2becec2dd9 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java @@ -29,8 +29,8 @@ import org.junit.Test; import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.MessageChannel; -import org.springframework.integration.channel.PublishSubscribeChannel; import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.dispatcher.PublishSubscribeChannel; import org.springframework.integration.endpoint.SourceEndpoint; import org.springframework.integration.handler.MessageHandler; import org.springframework.integration.message.ErrorMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java index cca9c19fcd..659f6462ea 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java @@ -28,9 +28,9 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.DispatcherPolicy; import org.springframework.integration.channel.MessageChannel; -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.MessageDeliveryException;