Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved PublishSubscribeChannel to 'dispatcher' package since it depends on dispatchers (avoids a tangle). Also moved the PublishSubscribeChannelParser into 'config'.

Browse Source
This commit is contained in:
Mark Fisher
2008-07-07 01:12:52 +00:00
parent c2d5f802c9
commit c7250f3ea5
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java
View File

@@ -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;

5
org.springframework.integration/src/main/java/org/springframework/integration/channel/config/PublishSubscribeChannelParser.java → org.springframework.integration/src/main/java/org/springframework/integration/config/PublishSubscribeChannelParser.java
View File

@@ -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;
/**

5
org.springframework.integration/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java → org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/PublishSubscribeChannel.java
View File

@@ -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;

2
org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java
View File

@@ -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;

2
org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java
View File

@@ -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;