Moved Subscription from 'bus' to 'scheduling' package.

spring-integration-core/src/main/java/org/springframework/integration/adapter/file/config/FileTargetAdapterParser.java

@@ -24,8 +24,8 @@ 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.adapter.file.FileTargetAdapter;
-import org.springframework.integration.bus.Subscription;
 import org.springframework.integration.endpoint.DefaultMessageEndpoint;
+import org.springframework.integration.scheduling.Subscription;
 
 /**
  * Parser for the <file-target/> element. 

spring-integration-core/src/main/java/org/springframework/integration/adapter/jms/config/JmsTargetAdapterParser.java

@@ -26,8 +26,8 @@ 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.adapter.jms.JmsTargetAdapter;
-import org.springframework.integration.bus.Subscription;
 import org.springframework.integration.endpoint.DefaultMessageEndpoint;
+import org.springframework.integration.scheduling.Subscription;
 import org.springframework.util.StringUtils;
 
 /**

spring-integration-core/src/main/java/org/springframework/integration/bus/MessageBus.java

@@ -46,6 +46,7 @@ import org.springframework.integration.scheduling.MessagingTaskScheduler;
 import org.springframework.integration.scheduling.MessagingTaskSchedulerAware;
 import org.springframework.integration.scheduling.Schedule;
 import org.springframework.integration.scheduling.SimpleMessagingTaskScheduler;
+import org.springframework.integration.scheduling.Subscription;
 import org.springframework.scheduling.concurrent.CustomizableThreadFactory;
 import org.springframework.util.Assert;
 

spring-integration-core/src/main/java/org/springframework/integration/config/ChannelAdapterParser.java

@@ -29,8 +29,8 @@ import org.springframework.integration.adapter.DefaultTargetAdapter;
 import org.springframework.integration.adapter.MethodInvokingSource;
 import org.springframework.integration.adapter.MethodInvokingTarget;
 import org.springframework.integration.adapter.PollingSourceAdapter;
-import org.springframework.integration.bus.Subscription;
 import org.springframework.integration.endpoint.DefaultMessageEndpoint;
+import org.springframework.integration.scheduling.Subscription;
 import org.springframework.util.StringUtils;
 
 /**

spring-integration-core/src/main/java/org/springframework/integration/config/EndpointParser.java

@@ -31,12 +31,12 @@ import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.MessagingConfigurationException;
-import org.springframework.integration.bus.Subscription;
 import org.springframework.integration.endpoint.ConcurrencyPolicy;
 import org.springframework.integration.endpoint.DefaultMessageEndpoint;
 import org.springframework.integration.handler.DefaultMessageHandlerAdapter;
 import org.springframework.integration.handler.MessageHandlerChain;
 import org.springframework.integration.scheduling.PollingSchedule;
+import org.springframework.integration.scheduling.Subscription;
 import org.springframework.util.StringUtils;
 
 /**

spring-integration-core/src/main/java/org/springframework/integration/config/MessageEndpointAnnotationPostProcessor.java

@@ -44,7 +44,6 @@ import org.springframework.integration.annotation.Polled;
 import org.springframework.integration.annotation.Router;
 import org.springframework.integration.annotation.Splitter;
 import org.springframework.integration.bus.MessageBus;
-import org.springframework.integration.bus.Subscription;
 import org.springframework.integration.channel.ChannelRegistryAware;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.SimpleChannel;
@@ -57,6 +56,7 @@ import org.springframework.integration.handler.config.RouterMessageHandlerCreato
 import org.springframework.integration.handler.config.SplitterMessageHandlerCreator;
 import org.springframework.integration.scheduling.PollingSchedule;
 import org.springframework.integration.scheduling.Schedule;
+import org.springframework.integration.scheduling.Subscription;
 import org.springframework.util.Assert;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;

spring-integration-core/src/main/java/org/springframework/integration/config/SubscriberAnnotationPostProcessor.java

@@ -28,8 +28,8 @@ import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.integration.annotation.Subscriber;
 import org.springframework.integration.bus.MessageBus;
-import org.springframework.integration.bus.Subscription;
 import org.springframework.integration.handler.DefaultMessageHandlerAdapter;
+import org.springframework.integration.scheduling.Subscription;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;

spring-integration-core/src/main/java/org/springframework/integration/endpoint/DefaultMessageEndpoint.java

@@ -24,7 +24,6 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.Lifecycle;
 import org.springframework.integration.MessageHandlingException;
 import org.springframework.integration.MessagingConfigurationException;
-import org.springframework.integration.bus.Subscription;
 import org.springframework.integration.channel.ChannelRegistry;
 import org.springframework.integration.channel.ChannelRegistryAware;
 import org.springframework.integration.channel.MessageChannel;
@@ -37,6 +36,7 @@ import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageHeader;
 import org.springframework.integration.message.selector.MessageSelector;
 import org.springframework.integration.message.selector.MessageSelectorRejectedException;
+import org.springframework.integration.scheduling.Subscription;
 import org.springframework.integration.util.ErrorHandler;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;

spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageEndpoint.java

@@ -17,8 +17,8 @@
 package org.springframework.integration.endpoint;
 
 import org.springframework.context.Lifecycle;
-import org.springframework.integration.bus.Subscription;
 import org.springframework.integration.handler.MessageHandler;
+import org.springframework.integration.scheduling.Subscription;
 
 /**
  * Base interface for message endpoints.

spring-integration-core/src/main/java/org/springframework/integration/scheduling/Subscription.java

@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.bus;
+package org.springframework.integration.scheduling;
 
 import org.springframework.integration.channel.MessageChannel;
-import org.springframework.integration.scheduling.Schedule;
 
 /**
  * Configuration metadata for activating a subscription.