From ee3ea753a9648490477a3458424896e9884c0a3c Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Thu, 14 Aug 2008 14:57:22 +0000 Subject: [PATCH] Moved all channel parsers into the org.springframework.integration.config package. --- .../{channel => }/config/AbstractChannelParser.java | 3 +-- .../integration/config/ChannelAdapterParser.java | 1 - .../integration/config/DefaultChannelParser.java | 1 - .../integration/config/DirectChannelParser.java | 1 - .../integration/config/IntegrationNamespaceHandler.java | 4 ---- .../{channel => }/config/PriorityChannelParser.java | 2 +- .../integration/config/PublishSubscribeChannelParser.java | 1 - .../integration/{channel => }/config/QueueChannelParser.java | 2 +- .../{channel => }/config/RendezvousChannelParser.java | 2 +- .../{channel => }/config/ThreadLocalChannelParser.java | 2 +- 10 files changed, 5 insertions(+), 14 deletions(-) rename org.springframework.integration/src/main/java/org/springframework/integration/{channel => }/config/AbstractChannelParser.java (96%) rename org.springframework.integration/src/main/java/org/springframework/integration/{channel => }/config/PriorityChannelParser.java (96%) rename org.springframework.integration/src/main/java/org/springframework/integration/{channel => }/config/QueueChannelParser.java (96%) rename org.springframework.integration/src/main/java/org/springframework/integration/{channel => }/config/RendezvousChannelParser.java (94%) rename org.springframework.integration/src/main/java/org/springframework/integration/{channel => }/config/ThreadLocalChannelParser.java (94%) diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/AbstractChannelParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractChannelParser.java similarity index 96% rename from org.springframework.integration/src/main/java/org/springframework/integration/channel/config/AbstractChannelParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractChannelParser.java index 058feb2bff..cb6af1a9ca 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/AbstractChannelParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractChannelParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.channel.config; +package org.springframework.integration.config; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -28,7 +28,6 @@ import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.integration.channel.interceptor.MessageSelectingInterceptor; -import org.springframework.integration.config.ChannelInterceptorParser; import org.springframework.integration.message.selector.PayloadTypeSelector; import org.springframework.util.StringUtils; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/ChannelAdapterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/ChannelAdapterParser.java index 0eac754573..f7f53545e9 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/ChannelAdapterParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/ChannelAdapterParser.java @@ -19,7 +19,6 @@ package org.springframework.integration.config; import org.w3c.dom.Element; import org.springframework.beans.factory.support.BeanDefinitionBuilder; -import org.springframework.integration.channel.config.AbstractChannelParser; import org.springframework.integration.channel.config.ChannelAdapterFactoryBean; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/DefaultChannelParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/DefaultChannelParser.java index bbe90fbf56..7fe965b871 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/DefaultChannelParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/DefaultChannelParser.java @@ -17,7 +17,6 @@ package org.springframework.integration.config; import org.springframework.integration.bus.DefaultChannelFactoryBean; -import org.springframework.integration.channel.config.AbstractChannelParser; import org.w3c.dom.Element; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/DirectChannelParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/DirectChannelParser.java index f2d0a7c6a0..29248d6f99 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/DirectChannelParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/DirectChannelParser.java @@ -18,7 +18,6 @@ package org.springframework.integration.config; import org.w3c.dom.Element; -import org.springframework.integration.channel.config.AbstractChannelParser; import org.springframework.integration.dispatcher.DirectChannel; /** 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 375b3dfafc..04d4748fc3 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 @@ -28,10 +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.PriorityChannelParser; -import org.springframework.integration.channel.config.QueueChannelParser; -import org.springframework.integration.channel.config.RendezvousChannelParser; -import org.springframework.integration.channel.config.ThreadLocalChannelParser; import org.springframework.integration.config.annotation.AnnotationDrivenParser; import org.springframework.integration.gateway.config.GatewayParser; import org.springframework.util.ClassUtils; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/PriorityChannelParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/PriorityChannelParser.java similarity index 96% rename from org.springframework.integration/src/main/java/org/springframework/integration/channel/config/PriorityChannelParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/PriorityChannelParser.java index b928f98d5f..eeca7c5333 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/PriorityChannelParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/PriorityChannelParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.channel.config; +package org.springframework.integration.config; import org.w3c.dom.Element; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/PublishSubscribeChannelParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/PublishSubscribeChannelParser.java index 6ed63cc98e..860025471c 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/PublishSubscribeChannelParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/PublishSubscribeChannelParser.java @@ -19,7 +19,6 @@ package org.springframework.integration.config; import org.w3c.dom.Element; import org.springframework.beans.factory.support.BeanDefinitionBuilder; -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/config/QueueChannelParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/QueueChannelParser.java similarity index 96% rename from org.springframework.integration/src/main/java/org/springframework/integration/channel/config/QueueChannelParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/QueueChannelParser.java index ce87a2425b..361ee58dc2 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/QueueChannelParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/QueueChannelParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.channel.config; +package org.springframework.integration.config; import org.w3c.dom.Element; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/RendezvousChannelParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/RendezvousChannelParser.java similarity index 94% rename from org.springframework.integration/src/main/java/org/springframework/integration/channel/config/RendezvousChannelParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/RendezvousChannelParser.java index 6e40f4ecdb..265cfc255b 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/RendezvousChannelParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/RendezvousChannelParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.channel.config; +package org.springframework.integration.config; import org.w3c.dom.Element; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/ThreadLocalChannelParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/ThreadLocalChannelParser.java similarity index 94% rename from org.springframework.integration/src/main/java/org/springframework/integration/channel/config/ThreadLocalChannelParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/ThreadLocalChannelParser.java index 1b7bc39106..340ec93d81 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/config/ThreadLocalChannelParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/ThreadLocalChannelParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.channel.config; +package org.springframework.integration.config; import org.w3c.dom.Element;