diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/AbstractRemotingGatewayParser.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/AbstractRemotingGatewayParser.java index 73945fe5f0..4549a39a06 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/AbstractRemotingGatewayParser.java +++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/AbstractRemotingGatewayParser.java @@ -23,7 +23,7 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.endpoint.config.ConsumerEndpointFactoryBean; +import org.springframework.integration.config.ConsumerEndpointFactoryBean; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/AbstractRemotingOutboundGatewayParser.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/AbstractRemotingOutboundGatewayParser.java index e6e5f15e3e..22bb6f028f 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/AbstractRemotingOutboundGatewayParser.java +++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/AbstractRemotingOutboundGatewayParser.java @@ -22,7 +22,7 @@ import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.config.AbstractConsumerEndpointParser; +import org.springframework.integration.config.xml.AbstractConsumerEndpointParser; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/AbstractFilePayloadTransformerParser.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/AbstractFilePayloadTransformerParser.java index e7db6479e5..4bb9c24cca 100644 --- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/AbstractFilePayloadTransformerParser.java +++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/AbstractFilePayloadTransformerParser.java @@ -20,7 +20,7 @@ import org.w3c.dom.Element; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.config.AbstractTransformerParser; +import org.springframework.integration.config.xml.AbstractTransformerParser; /** * Base class for File payload transformer parsers. diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileInboundChannelAdapterParser.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileInboundChannelAdapterParser.java index bd23029499..9d21852a3c 100644 --- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileInboundChannelAdapterParser.java +++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileInboundChannelAdapterParser.java @@ -23,7 +23,7 @@ import org.w3c.dom.Element; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.config.AbstractPollingInboundChannelAdapterParser; +import org.springframework.integration.config.xml.AbstractPollingInboundChannelAdapterParser; import org.springframework.integration.file.AcceptOnceFileListFilter; import org.springframework.integration.file.CompositeFileListFilter; import org.springframework.integration.file.PatternMatchingFileListFilter; diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParser.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParser.java index c7901108f6..659f2155ea 100644 --- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParser.java +++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParser.java @@ -21,7 +21,7 @@ import org.w3c.dom.Element; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.config.AbstractOutboundChannelAdapterParser; +import org.springframework.integration.config.xml.AbstractOutboundChannelAdapterParser; import org.springframework.integration.file.FileWritingMessageConsumer; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileToStringTransformerParser.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileToStringTransformerParser.java index b439e48e90..6e91a32c3c 100644 --- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileToStringTransformerParser.java +++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileToStringTransformerParser.java @@ -20,7 +20,7 @@ import org.w3c.dom.Element; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.config.IntegrationNamespaceUtils; +import org.springframework.integration.config.xml.IntegrationNamespaceUtils; import org.springframework.integration.file.transformer.FileToStringTransformer; import org.springframework.integration.transformer.Transformer; diff --git a/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParser.java b/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParser.java index e4a85b3ac5..334deb992e 100644 --- a/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParser.java +++ b/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParser.java @@ -21,8 +21,8 @@ import org.w3c.dom.Element; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.config.AbstractPollingInboundChannelAdapterParser; -import org.springframework.integration.config.IntegrationNamespaceUtils; +import org.springframework.integration.config.xml.AbstractPollingInboundChannelAdapterParser; +import org.springframework.integration.config.xml.IntegrationNamespaceUtils; import org.springframework.integration.ftp.FtpSource; import org.springframework.integration.ftp.QueuedFTPClientPool; diff --git a/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParser.java b/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParser.java index c9d4c762c3..f58d9f295d 100644 --- a/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParser.java +++ b/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParser.java @@ -21,7 +21,7 @@ import org.w3c.dom.Element; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.config.AbstractOutboundChannelAdapterParser; +import org.springframework.integration.config.xml.AbstractOutboundChannelAdapterParser; import org.springframework.integration.ftp.FtpSendingMessageConsumer; import org.springframework.integration.ftp.QueuedFTPClientPool; diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsGatewayParser.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsGatewayParser.java index 4937d27992..9cdb72b3c3 100644 --- a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsGatewayParser.java +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsGatewayParser.java @@ -24,7 +24,7 @@ import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.config.IntegrationNamespaceUtils; +import org.springframework.integration.config.xml.IntegrationNamespaceUtils; import org.springframework.integration.jms.JmsGateway; import org.springframework.util.StringUtils; diff --git a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/MailNamespaceHandler.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/MailNamespaceHandler.java index 797bbbfc39..ef9ebdbafe 100644 --- a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/MailNamespaceHandler.java +++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/MailNamespaceHandler.java @@ -17,7 +17,7 @@ package org.springframework.integration.mail.config; import org.springframework.beans.factory.xml.NamespaceHandlerSupport; -import org.springframework.integration.config.SimpleHeaderEnricherParser; +import org.springframework.integration.config.xml.SimpleHeaderEnricherParser; import org.springframework.integration.mail.MailHeaders; /** diff --git a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/MailOutboundChannelAdapterParser.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/MailOutboundChannelAdapterParser.java index bb7720e925..1e6f2194a9 100644 --- a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/MailOutboundChannelAdapterParser.java +++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/MailOutboundChannelAdapterParser.java @@ -22,8 +22,8 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.config.AbstractOutboundChannelAdapterParser; -import org.springframework.integration.config.IntegrationNamespaceUtils; +import org.springframework.integration.config.xml.AbstractOutboundChannelAdapterParser; +import org.springframework.integration.config.xml.IntegrationNamespaceUtils; import org.springframework.integration.mail.MailSendingMessageConsumer; import org.springframework.mail.javamail.JavaMailSenderImpl; import org.springframework.util.Assert; diff --git a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/MailToStringTransformerParser.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/MailToStringTransformerParser.java index b3c9a54328..c5be311f91 100644 --- a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/MailToStringTransformerParser.java +++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/MailToStringTransformerParser.java @@ -20,8 +20,8 @@ import org.w3c.dom.Element; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.config.AbstractTransformerParser; -import org.springframework.integration.config.IntegrationNamespaceUtils; +import org.springframework.integration.config.xml.AbstractTransformerParser; +import org.springframework.integration.config.xml.IntegrationNamespaceUtils; import org.springframework.integration.mail.transformer.MailToStringTransformer; import org.springframework.integration.transformer.Transformer; diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java index a80000f422..85ad4c9b3e 100644 --- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java +++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java @@ -21,7 +21,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.ChannelRegistry; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.config.MessageBusParser; +import org.springframework.integration.config.xml.MessageBusParser; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/SecuredChannelsParser.java b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/SecuredChannelsParser.java index f9d21a3dfe..594c43fc14 100644 --- a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/SecuredChannelsParser.java +++ b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/config/SecuredChannelsParser.java @@ -26,7 +26,7 @@ import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.integration.channel.MessageChannel; -import org.springframework.integration.config.IntegrationNamespaceUtils; +import org.springframework.integration.config.xml.IntegrationNamespaceUtils; import org.springframework.integration.security.channel.ChannelAccessPolicy; import org.springframework.integration.security.channel.ChannelInvocationDefinitionSource; import org.springframework.integration.security.channel.ChannelSecurityInterceptor; diff --git a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParser.java b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParser.java index ef5d360ccc..1307394788 100644 --- a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParser.java +++ b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParser.java @@ -21,7 +21,7 @@ import org.w3c.dom.Element; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.config.AbstractPollingInboundChannelAdapterParser; +import org.springframework.integration.config.xml.AbstractPollingInboundChannelAdapterParser; import org.springframework.integration.stream.CharacterStreamSource; import org.springframework.util.StringUtils; diff --git a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/config/ConsoleOutboundChannelAdapterParser.java b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/config/ConsoleOutboundChannelAdapterParser.java index c05c16daf1..b805bd7af2 100644 --- a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/config/ConsoleOutboundChannelAdapterParser.java +++ b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/config/ConsoleOutboundChannelAdapterParser.java @@ -21,7 +21,7 @@ import org.w3c.dom.Element; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.config.AbstractOutboundChannelAdapterParser; +import org.springframework.integration.config.xml.AbstractOutboundChannelAdapterParser; import org.springframework.integration.stream.CharacterStreamWritingMessageConsumer; import org.springframework.util.StringUtils; diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParser.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParser.java index 7b6c625669..0f31cce855 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParser.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParser.java @@ -20,7 +20,7 @@ import org.w3c.dom.Element; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.config.AbstractTransformerParser; +import org.springframework.integration.config.xml.AbstractTransformerParser; import org.springframework.integration.transformer.Transformer; import org.springframework.integration.xml.transformer.XmlPayloadMarshallingTransformer; import org.springframework.util.Assert; diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParser.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParser.java index 2ad11a4292..a275ca83f9 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParser.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParser.java @@ -20,7 +20,7 @@ import org.w3c.dom.Element; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.config.AbstractTransformerParser; +import org.springframework.integration.config.xml.AbstractTransformerParser; import org.springframework.integration.transformer.Transformer; import org.springframework.integration.xml.transformer.XmlPayloadUnmarshallingTransformer; import org.springframework.util.Assert; diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XsltPayloadTransformerParser.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XsltPayloadTransformerParser.java index 6690f58a89..7a01d82043 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XsltPayloadTransformerParser.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/XsltPayloadTransformerParser.java @@ -20,8 +20,8 @@ import org.w3c.dom.Element; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.config.AbstractTransformerParser; -import org.springframework.integration.config.IntegrationNamespaceUtils; +import org.springframework.integration.config.xml.AbstractTransformerParser; +import org.springframework.integration.config.xml.IntegrationNamespaceUtils; import org.springframework.integration.transformer.Transformer; import org.springframework.integration.xml.transformer.XsltPayloadTransformer; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/config/ConsumerEndpointFactoryBean.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java similarity index 99% rename from org.springframework.integration/src/main/java/org/springframework/integration/endpoint/config/ConsumerEndpointFactoryBean.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java index b89bec30b6..8f46acefdb 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/config/ConsumerEndpointFactoryBean.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.endpoint.config; +package org.springframework.integration.config; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java index 1da317e6e0..bbce2d8599 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java @@ -29,7 +29,7 @@ import org.springframework.integration.channel.ChannelRegistryAware; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.channel.SubscribableChannel; -import org.springframework.integration.config.MessageBusParser; +import org.springframework.integration.config.xml.MessageBusParser; import org.springframework.integration.endpoint.AbstractMessageConsumer; import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer; import org.springframework.integration.endpoint.MessageEndpoint; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ChannelAdapterAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ChannelAdapterAnnotationPostProcessor.java index 8618548c4f..c3784eb098 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ChannelAdapterAnnotationPostProcessor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/ChannelAdapterAnnotationPostProcessor.java @@ -27,7 +27,7 @@ import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.channel.SubscribableChannel; -import org.springframework.integration.config.MessageBusParser; +import org.springframework.integration.config.xml.MessageBusParser; import org.springframework.integration.endpoint.MessageEndpoint; import org.springframework.integration.endpoint.PollingConsumerEndpoint; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java index f348c5b6c6..3d02cdced6 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java @@ -41,7 +41,7 @@ import org.springframework.integration.annotation.Splitter; import org.springframework.integration.annotation.Transformer; import org.springframework.integration.bus.MessageBus; import org.springframework.integration.channel.ChannelRegistryAware; -import org.springframework.integration.config.MessageBusParser; +import org.springframework.integration.config.xml.MessageBusParser; import org.springframework.integration.endpoint.MessageEndpoint; import org.springframework.stereotype.Component; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractChannelAdapterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractChannelAdapterParser.java similarity index 98% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractChannelAdapterParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractChannelAdapterParser.java index 972a7f5ae6..733a760906 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractChannelAdapterParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractChannelAdapterParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractChannelParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractChannelParser.java similarity index 98% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractChannelParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractChannelParser.java index 40ff8a8705..2d9d5827ca 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractChannelParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractChannelParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractConsumerEndpointParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractConsumerEndpointParser.java similarity index 97% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractConsumerEndpointParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractConsumerEndpointParser.java index 5ae42b0aa3..90cfdb2c04 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractConsumerEndpointParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractConsumerEndpointParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; @@ -24,7 +24,7 @@ import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.endpoint.config.ConsumerEndpointFactoryBean; +import org.springframework.integration.config.ConsumerEndpointFactoryBean; import org.springframework.util.Assert; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractInterceptorParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractInterceptorParser.java similarity index 98% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractInterceptorParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractInterceptorParser.java index 135064795b..f47bcad966 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractInterceptorParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractInterceptorParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import java.util.HashMap; import java.util.Map; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractOutboundChannelAdapterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractOutboundChannelAdapterParser.java similarity index 95% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractOutboundChannelAdapterParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractOutboundChannelAdapterParser.java index 2796403a5f..8d82207fd9 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractOutboundChannelAdapterParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractOutboundChannelAdapterParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; @@ -22,7 +22,7 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.endpoint.config.ConsumerEndpointFactoryBean; +import org.springframework.integration.config.ConsumerEndpointFactoryBean; import org.springframework.util.Assert; import org.springframework.util.xml.DomUtils; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractPollingInboundChannelAdapterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractPollingInboundChannelAdapterParser.java similarity index 98% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractPollingInboundChannelAdapterParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractPollingInboundChannelAdapterParser.java index 8f02113f75..5caffe7cf8 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractPollingInboundChannelAdapterParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractPollingInboundChannelAdapterParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractTransformerParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractTransformerParser.java similarity index 97% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractTransformerParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractTransformerParser.java index 68a25027d6..b802abf646 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/AbstractTransformerParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractTransformerParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/AggregatorParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AggregatorParser.java similarity index 98% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/AggregatorParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AggregatorParser.java index 12c9470898..a984de11ec 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/AggregatorParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AggregatorParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/BeanDefinitionRegisteringParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/BeanDefinitionRegisteringParser.java similarity index 95% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/BeanDefinitionRegisteringParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/BeanDefinitionRegisteringParser.java index 22056b46ea..36253f958c 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/BeanDefinitionRegisteringParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/BeanDefinitionRegisteringParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/ChannelInterceptorParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ChannelInterceptorParser.java similarity index 95% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/ChannelInterceptorParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ChannelInterceptorParser.java index 2312c1e72e..22ffa312fc 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/ChannelInterceptorParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ChannelInterceptorParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import java.util.HashMap; import java.util.Map; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/FilterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/FilterParser.java similarity index 96% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/FilterParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/FilterParser.java index d9266e7eb9..d149299352 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/FilterParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/FilterParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/GatewayParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/GatewayParser.java similarity index 97% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/GatewayParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/GatewayParser.java index 6a422159a6..6d7f3b98c7 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/GatewayParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/GatewayParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; 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/xml/IntegrationNamespaceHandler.java similarity index 97% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java index 70abc481f5..5862a7624c 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/xml/IntegrationNamespaceHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.springframework.beans.factory.xml.NamespaceHandlerSupport; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceUtils.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java similarity index 99% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceUtils.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java index e939bb19f7..f5af5fcf39 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceUtils.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/MessageBusParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/MessageBusParser.java similarity index 99% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/MessageBusParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/MessageBusParser.java index 4123cb1bca..e4c3b93964 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/MessageBusParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/MessageBusParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingInboundChannelAdapterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/MethodInvokingInboundChannelAdapterParser.java similarity index 97% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingInboundChannelAdapterParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/MethodInvokingInboundChannelAdapterParser.java index bf6543ce72..117184ab04 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingInboundChannelAdapterParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/MethodInvokingInboundChannelAdapterParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingOutboundChannelAdapterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/MethodInvokingOutboundChannelAdapterParser.java similarity index 97% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingOutboundChannelAdapterParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/MethodInvokingOutboundChannelAdapterParser.java index f6464aca7a..1eef215d57 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/MethodInvokingOutboundChannelAdapterParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/MethodInvokingOutboundChannelAdapterParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/PointToPointChannelParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/PointToPointChannelParser.java similarity index 98% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/PointToPointChannelParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/PointToPointChannelParser.java index 45ec0f3dda..c79f8e3b85 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/PointToPointChannelParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/PointToPointChannelParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/PoolExecutorParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/PoolExecutorParser.java similarity index 98% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/PoolExecutorParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/PoolExecutorParser.java index fcece8666d..bc4a7af2e9 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/PoolExecutorParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/PoolExecutorParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import java.util.concurrent.RejectedExecutionHandler; import java.util.concurrent.ThreadPoolExecutor; 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/xml/PublishSubscribeChannelParser.java similarity index 96% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/PublishSubscribeChannelParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/PublishSubscribeChannelParser.java index 2ae0e2fa1a..678e2abe5d 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/xml/PublishSubscribeChannelParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/ResequencerParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ResequencerParser.java similarity index 98% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/ResequencerParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ResequencerParser.java index e8fbae4e88..888657d68c 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/ResequencerParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ResequencerParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/RouterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/RouterParser.java similarity index 96% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/RouterParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/RouterParser.java index 0b1707be4f..cd7a39aee1 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/RouterParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/RouterParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/SelectorChainParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/SelectorChainParser.java similarity index 97% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/SelectorChainParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/SelectorChainParser.java index 3ae37b3230..3447856ddb 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/SelectorChainParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/SelectorChainParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/ServiceActivatorParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ServiceActivatorParser.java similarity index 96% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/ServiceActivatorParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ServiceActivatorParser.java index fe50c7b0e8..5a2eea0d7b 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/ServiceActivatorParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ServiceActivatorParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/SimpleHeaderEnricherParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/SimpleHeaderEnricherParser.java similarity index 97% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/SimpleHeaderEnricherParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/SimpleHeaderEnricherParser.java index d248924e8d..6d7ae4daae 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/SimpleHeaderEnricherParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/SimpleHeaderEnricherParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import java.util.HashMap; import java.util.Map; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/SplitterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/SplitterParser.java similarity index 92% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/SplitterParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/SplitterParser.java index a5277c4ab9..965c5c9118 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/SplitterParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/SplitterParser.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; +import org.springframework.integration.config.SplitterFactoryBean; import org.springframework.util.StringUtils; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/ThreadLocalChannelParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ThreadLocalChannelParser.java similarity index 95% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/ThreadLocalChannelParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ThreadLocalChannelParser.java index 9c9161e6b8..d2544902ef 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/ThreadLocalChannelParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ThreadLocalChannelParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/TransformerParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/TransformerParser.java similarity index 96% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/TransformerParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/TransformerParser.java index f90514895b..acfeb1cafe 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/TransformerParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/TransformerParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/WireTapParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/WireTapParser.java similarity index 97% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/WireTapParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/WireTapParser.java index 524ebb913d..775c1ad102 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/WireTapParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/WireTapParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.config; +package org.springframework.integration.config.xml; import org.w3c.dom.Element; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/spring-integration-1.0.xsd similarity index 100% rename from org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd rename to org.springframework.integration/src/main/java/org/springframework/integration/config/xml/spring-integration-1.0.xsd diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java index 3069c8346b..8698ad4cf3 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java @@ -36,7 +36,7 @@ import org.springframework.integration.annotation.Gateway; import org.springframework.integration.bus.MessageBus; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.config.MessageBusParser; +import org.springframework.integration.config.xml.MessageBusParser; import org.springframework.integration.endpoint.MessagingGateway; import org.springframework.integration.message.Message; import org.springframework.integration.message.MethodParameterMessageMapper; diff --git a/org.springframework.integration/src/main/resources/META-INF/spring.handlers b/org.springframework.integration/src/main/resources/META-INF/spring.handlers index b6de0cb6fe..992546e207 100644 --- a/org.springframework.integration/src/main/resources/META-INF/spring.handlers +++ b/org.springframework.integration/src/main/resources/META-INF/spring.handlers @@ -1 +1 @@ -http\://www.springframework.org/schema/integration=org.springframework.integration.config.IntegrationNamespaceHandler \ No newline at end of file +http\://www.springframework.org/schema/integration=org.springframework.integration.config.xml.IntegrationNamespaceHandler \ No newline at end of file diff --git a/org.springframework.integration/src/main/resources/META-INF/spring.schemas b/org.springframework.integration/src/main/resources/META-INF/spring.schemas index bc2146688a..10dbd9caf2 100644 --- a/org.springframework.integration/src/main/resources/META-INF/spring.schemas +++ b/org.springframework.integration/src/main/resources/META-INF/spring.schemas @@ -1 +1 @@ -http\://www.springframework.org/schema/integration/spring-integration-1.0.xsd=org/springframework/integration/config/spring-integration-1.0.xsd \ No newline at end of file +http\://www.springframework.org/schema/integration/spring-integration-1.0.xsd=org/springframework/integration/config/xml/spring-integration-1.0.xsd \ No newline at end of file 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 dc1a8ea480..f16eab267b 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 @@ -35,7 +35,7 @@ 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.MessageBusParser; +import org.springframework.integration.config.xml.MessageBusParser; import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer; import org.springframework.integration.endpoint.PollingConsumerEndpoint; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java index 27298cab44..e7a45d30a6 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java @@ -28,8 +28,8 @@ import org.springframework.integration.channel.ChannelRegistry; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.ThreadLocalChannel; -import org.springframework.integration.config.MessageBusParser; import org.springframework.integration.config.annotation.MessagingAnnotationPostProcessor; +import org.springframework.integration.config.xml.MessageBusParser; import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer; import org.springframework.integration.endpoint.ServiceActivatorEndpoint; import org.springframework.integration.endpoint.SubscribingConsumerEndpoint; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java index ff574e0c52..fcec258c30 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java @@ -27,6 +27,7 @@ import org.springframework.integration.bus.MessageBus; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; +import org.springframework.integration.config.xml.MessageBusParser; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.endpoint.SubscribingConsumerEndpoint; import org.springframework.integration.message.Message; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java index b02cc8339d..6660f594a7 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java @@ -36,6 +36,7 @@ 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.config.xml.MessageBusParser; import org.springframework.integration.scheduling.TaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/ServiceActivatorAnnotationPostProcessorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/ServiceActivatorAnnotationPostProcessorTests.java index 675f97c048..d1cdc0d413 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/ServiceActivatorAnnotationPostProcessorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/ServiceActivatorAnnotationPostProcessorTests.java @@ -32,6 +32,7 @@ import org.springframework.integration.bus.DefaultMessageBus; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.annotation.MessagingAnnotationPostProcessor; +import org.springframework.integration.config.xml.MessageBusParser; import org.springframework.integration.message.StringMessage; import org.springframework.integration.util.TestUtils; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java index 5315d4e248..473e42cdd3 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java @@ -35,7 +35,7 @@ import org.springframework.integration.aggregator.AbstractMessageAggregator; import org.springframework.integration.aggregator.CompletionStrategyAdapter; import org.springframework.integration.aggregator.SequenceSizeCompletionStrategy; import org.springframework.integration.bus.MessageBus; -import org.springframework.integration.config.MessageBusParser; +import org.springframework.integration.config.xml.MessageBusParser; import org.springframework.integration.endpoint.SubscribingConsumerEndpoint; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java index db8904fbf4..7d198afd65 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java @@ -45,7 +45,7 @@ import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.config.MessageBusParser; +import org.springframework.integration.config.xml.MessageBusParser; import org.springframework.integration.endpoint.PollingConsumerEndpoint; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageConsumer; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessorTests.java index c47924628a..1d603d4cbb 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessorTests.java @@ -27,7 +27,7 @@ import org.springframework.integration.annotation.Router; import org.springframework.integration.bus.DefaultMessageBus; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.config.MessageBusParser; +import org.springframework.integration.config.xml.MessageBusParser; import org.springframework.integration.message.Message; import org.springframework.integration.message.StringMessage; import org.springframework.integration.util.TestUtils; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessorTests.java index 78eaac3066..25b60612a3 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessorTests.java @@ -29,7 +29,7 @@ import org.springframework.integration.annotation.Splitter; import org.springframework.integration.bus.DefaultMessageBus; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.config.MessageBusParser; +import org.springframework.integration.config.xml.MessageBusParser; import org.springframework.integration.message.Message; import org.springframework.integration.message.StringMessage; import org.springframework.integration.util.TestUtils;