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

Moved DefaultChannelFactoryBean from 'channel/factory' to 'bus' and moved DefaultChannelParser from 'channel/config' to 'config' to avoid tangles.

Browse Source
This commit is contained in:
Mark Fisher
2008-05-22 01:39:59 +00:00
parent cefb7d0ca8
commit 4995cdb5de
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
org.springframework.integration/src/main/java/org/springframework/integration/channel/factory/DefaultChannelFactoryBean.java → org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultChannelFactoryBean.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.integration.channel.factory;
package org.springframework.integration.bus;
import java.util.List;
import java.util.Map;
@@ -22,10 +22,11 @@ import java.util.Map;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.integration.bus.MessageBus;
import org.springframework.integration.channel.ChannelInterceptor;
import org.springframework.integration.channel.DispatcherPolicy;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.channel.factory.ChannelFactory;
import org.springframework.integration.channel.factory.QueueChannelFactory;
import org.springframework.util.Assert;
/**
@@ -37,7 +38,7 @@ import org.springframework.util.Assert;
*
* @author Marius Bogoevici
*/
public class DefaultChannelFactoryBean implements ApplicationContextAware, FactoryBean{
public class DefaultChannelFactoryBean implements ApplicationContextAware, FactoryBean {
private volatile ChannelFactory channelFactory;

6
org.springframework.integration/src/main/java/org/springframework/integration/channel/config/DefaultChannelParser.java → org.springframework.integration/src/main/java/org/springframework/integration/config/DefaultChannelParser.java
View File

@@ -14,11 +14,13 @@
* limitations under the License.
*/
package org.springframework.integration.channel.config;
package org.springframework.integration.config;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.integration.bus.DefaultChannelFactoryBean;
import org.springframework.integration.channel.DispatcherPolicy;
import org.springframework.integration.channel.factory.DefaultChannelFactoryBean;
import org.springframework.integration.channel.config.AbstractChannelParser;
import org.w3c.dom.Element;
/**

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

@@ -28,7 +28,6 @@ import org.apache.commons.logging.LogFactory;
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.DefaultChannelParser;
import org.springframework.integration.channel.config.DirectChannelParser;
import org.springframework.integration.channel.config.PriorityChannelParser;
import org.springframework.integration.channel.config.QueueChannelParser;

1
org.springframework.integration/src/test/java/org/springframework/integration/channel/factory/ChannelFactoryTests.java
View File

@@ -29,6 +29,7 @@ import org.junit.Test;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.context.support.StaticApplicationContext;
import org.springframework.integration.bus.DefaultChannelFactoryBean;
import org.springframework.integration.bus.MessageBus;
import org.springframework.integration.channel.AbstractMessageChannel;
import org.springframework.integration.channel.ChannelInterceptor;