Moved annotations to a common package.

spring-integration-core/src/main/java/org/springframework/integration/annotation/DefaultOutput.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.endpoint.annotation;
+package org.springframework.integration.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-integration-core/src/main/java/org/springframework/integration/annotation/Handler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.handler.annotation;
+package org.springframework.integration.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -23,7 +23,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.integration.endpoint.annotation.MessageEndpoint;
 
 /**
  * Indicates that a method is capable of handling a message or message payload.

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.endpoint.annotation;
+package org.springframework.integration.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-integration-core/src/main/java/org/springframework/integration/annotation/Polled.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.endpoint.annotation;
+package org.springframework.integration.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-integration-core/src/main/java/org/springframework/integration/annotation/Publisher.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.aop;
+package org.springframework.integration.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-integration-core/src/main/java/org/springframework/integration/annotation/Router.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.handler.annotation;
+package org.springframework.integration.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-integration-core/src/main/java/org/springframework/integration/annotation/Splitter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.handler.annotation;
+package org.springframework.integration.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-integration-core/src/main/java/org/springframework/integration/annotation/Subscriber.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.endpoint.annotation;
+package org.springframework.integration.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java

@@ -23,6 +23,7 @@ import org.aopalliance.aop.Advice;
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.support.AbstractPointcutAdvisor;
 import org.springframework.aop.support.annotation.AnnotationMatchingPointcut;
+import org.springframework.integration.annotation.Publisher;
 import org.springframework.integration.channel.ChannelRegistry;
 import org.springframework.util.Assert;
 

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

@@ -33,20 +33,20 @@ import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.core.OrderComparator;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.integration.MessagingConfigurationException;
+import org.springframework.integration.annotation.DefaultOutput;
+import org.springframework.integration.annotation.Handler;
+import org.springframework.integration.annotation.MessageEndpoint;
+import org.springframework.integration.annotation.Polled;
+import org.springframework.integration.annotation.Router;
+import org.springframework.integration.annotation.Splitter;
 import org.springframework.integration.bus.ConsumerPolicy;
 import org.springframework.integration.bus.MessageBus;
 import org.springframework.integration.channel.ChannelRegistryAware;
 import org.springframework.integration.endpoint.GenericMessageEndpoint;
 import org.springframework.integration.endpoint.InboundMethodInvokingChannelAdapter;
 import org.springframework.integration.endpoint.OutboundMethodInvokingChannelAdapter;
-import org.springframework.integration.endpoint.annotation.DefaultOutput;
-import org.springframework.integration.endpoint.annotation.MessageEndpoint;
-import org.springframework.integration.endpoint.annotation.Polled;
 import org.springframework.integration.handler.MessageHandler;
 import org.springframework.integration.handler.MessageHandlerChain;
-import org.springframework.integration.handler.annotation.Handler;
-import org.springframework.integration.handler.annotation.Router;
-import org.springframework.integration.handler.annotation.Splitter;
 import org.springframework.integration.handler.config.DefaultMessageHandlerCreator;
 import org.springframework.integration.handler.config.MessageHandlerCreator;
 import org.springframework.integration.handler.config.RouterMessageHandlerCreator;

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

@@ -25,7 +25,7 @@ import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.integration.aop.Publisher;
+import org.springframework.integration.annotation.Publisher;
 import org.springframework.integration.aop.PublisherAnnotationAdvisor;
 import org.springframework.integration.channel.ChannelRegistry;
 import org.springframework.util.Assert;

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

@@ -26,9 +26,9 @@ import org.springframework.aop.framework.Advised;
 import org.springframework.beans.BeansException;
 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.endpoint.GenericMessageEndpoint;
-import org.springframework.integration.endpoint.annotation.Subscriber;
 import org.springframework.integration.handler.DefaultMessageHandlerAdapter;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;

spring-integration-core/src/main/java/org/springframework/integration/router/RouterMessageHandlerAdapter.java

@@ -21,12 +21,12 @@ import java.util.Collection;
 import java.util.Map;
 
 import org.springframework.integration.MessagingConfigurationException;
+import org.springframework.integration.annotation.Router;
 import org.springframework.integration.channel.ChannelRegistry;
 import org.springframework.integration.channel.ChannelRegistryAware;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.endpoint.SimpleMethodInvoker;
 import org.springframework.integration.handler.AbstractMessageHandlerAdapter;
-import org.springframework.integration.handler.annotation.Router;
 import org.springframework.integration.message.Message;
 import org.springframework.util.StringUtils;
 

spring-integration-core/src/main/java/org/springframework/integration/router/SplitterMessageHandlerAdapter.java

@@ -21,12 +21,12 @@ import java.util.Collection;
 import java.util.Map;
 
 import org.springframework.integration.MessagingConfigurationException;
+import org.springframework.integration.annotation.Splitter;
 import org.springframework.integration.channel.ChannelRegistry;
 import org.springframework.integration.channel.ChannelRegistryAware;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.endpoint.SimpleMethodInvoker;
 import org.springframework.integration.handler.AbstractMessageHandlerAdapter;
-import org.springframework.integration.handler.annotation.Splitter;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.message.Message;