From 2f0f676f4875775f68c283994488bfeff28397c5 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 20 Nov 2013 22:04:15 -0500 Subject: [PATCH] INT-3213 Fix Package Tangle JIRA: https://jira.springsource.org/browse/INT-3213 Backwards reference from ....support.channel to ....channel.registry (BeanFactoryChannelResolver). - Move the registry interface to ....support.channel - Move the implementation to ....channel --- .../channel/{registry => }/DefaultHeaderChannelRegistry.java | 3 ++- .../config/xml/AbstractIntegrationNamespaceHandler.java | 2 +- .../support/channel/BeanFactoryChannelResolver.java | 1 - .../registry => support/channel}/HeaderChannelRegistry.java | 3 +-- .../channel/registry/HeaderChannelRegistryTests.java | 1 + .../integration/config/xml/ControlBusTests.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename spring-integration-core/src/main/java/org/springframework/integration/channel/{registry => }/DefaultHeaderChannelRegistry.java (98%) rename spring-integration-core/src/main/java/org/springframework/integration/{channel/registry => support/channel}/HeaderChannelRegistry.java (93%) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/registry/DefaultHeaderChannelRegistry.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/DefaultHeaderChannelRegistry.java similarity index 98% rename from spring-integration-core/src/main/java/org/springframework/integration/channel/registry/DefaultHeaderChannelRegistry.java rename to spring-integration-core/src/main/java/org/springframework/integration/channel/DefaultHeaderChannelRegistry.java index 3aa7050153..1db3767cb3 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/registry/DefaultHeaderChannelRegistry.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/DefaultHeaderChannelRegistry.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.channel.registry; +package org.springframework.integration.channel; import java.util.Date; import java.util.Iterator; @@ -28,6 +28,7 @@ import org.springframework.context.SmartLifecycle; import org.springframework.integration.MessageChannel; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.support.channel.BeanFactoryChannelResolver; +import org.springframework.integration.support.channel.HeaderChannelRegistry; import org.springframework.scheduling.TaskScheduler; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java index 052b644dbb..928ebe2c5b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java @@ -43,7 +43,7 @@ import org.springframework.beans.factory.xml.ParserContext; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.ResourcePatternResolver; -import org.springframework.integration.channel.registry.DefaultHeaderChannelRegistry; +import org.springframework.integration.channel.DefaultHeaderChannelRegistry; import org.springframework.integration.config.IntegrationEvaluationContextFactoryBean; import org.springframework.integration.config.xml.ChannelInitializer.AutoCreateCandidatesCollector; import org.springframework.integration.context.IntegrationContextUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/channel/BeanFactoryChannelResolver.java b/spring-integration-core/src/main/java/org/springframework/integration/support/channel/BeanFactoryChannelResolver.java index 2a17a0e139..d3ef03bd46 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/channel/BeanFactoryChannelResolver.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/channel/BeanFactoryChannelResolver.java @@ -23,7 +23,6 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.integration.MessageChannel; -import org.springframework.integration.channel.registry.HeaderChannelRegistry; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/registry/HeaderChannelRegistry.java b/spring-integration-core/src/main/java/org/springframework/integration/support/channel/HeaderChannelRegistry.java similarity index 93% rename from spring-integration-core/src/main/java/org/springframework/integration/channel/registry/HeaderChannelRegistry.java rename to spring-integration-core/src/main/java/org/springframework/integration/support/channel/HeaderChannelRegistry.java index 66fd2eb118..7d150076b4 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/registry/HeaderChannelRegistry.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/channel/HeaderChannelRegistry.java @@ -13,10 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.channel.registry; +package org.springframework.integration.support.channel; import org.springframework.integration.MessageChannel; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; import org.springframework.jmx.export.annotation.ManagedAttribute; import org.springframework.jmx.export.annotation.ManagedOperation; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/registry/HeaderChannelRegistryTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/registry/HeaderChannelRegistryTests.java index 363f154299..e5d9091b66 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/registry/HeaderChannelRegistryTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/registry/HeaderChannelRegistryTests.java @@ -30,6 +30,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.Message; import org.springframework.integration.MessageChannel; +import org.springframework.integration.channel.DefaultHeaderChannelRegistry; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.MessagePublishingErrorHandler; import org.springframework.integration.channel.QueueChannel; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusTests.java index a5efb64f48..8ae212a409 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusTests.java @@ -30,8 +30,8 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.Message; import org.springframework.integration.MessageChannel; +import org.springframework.integration.channel.DefaultHeaderChannelRegistry; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.channel.registry.DefaultHeaderChannelRegistry; import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.message.GenericMessage;