From 218b100ab76a0ea68a005b8975a9a6f7f14b1bd9 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Wed, 20 Aug 2008 04:42:43 +0000
Subject: [PATCH] Moved the @Publisher annotation into the 'aop' package to
 avoid a cycle.

---
 .../integration/{annotation => aop}/Publisher.java            | 4 +---
 .../integration/aop/PublisherAnnotationAdvisor.java           | 1 -
 .../config/annotation/PublisherAnnotationPostProcessor.java   | 2 +-
 .../integration/aop/PublisherAnnotationAdvisorTests.java      | 1 -
 .../integration/aop/PublisherAnnotationTestBean.java          | 1 -
 5 files changed, 2 insertions(+), 7 deletions(-)
 rename org.springframework.integration/src/main/java/org/springframework/integration/{annotation => aop}/Publisher.java (91%)

diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Publisher.java b/org.springframework.integration/src/main/java/org/springframework/integration/aop/Publisher.java
similarity index 91%
rename from org.springframework.integration/src/main/java/org/springframework/integration/annotation/Publisher.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/aop/Publisher.java
index b2b8eb0c04..f8bb60b97f 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Publisher.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/aop/Publisher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.annotation;
+package org.springframework.integration.aop;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -23,8 +23,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.integration.aop.MessagePublishingInterceptor;
-
 /**
  * Indicates that the method's return value should be published to the specified
  * channel. The value will only be published if non-null.
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java b/org.springframework.integration/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java
index 13d09b862f..6913a99309 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java
@@ -23,7 +23,6 @@ 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;
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/PublisherAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/PublisherAnnotationPostProcessor.java
index 8fdc83966d..fc44d15adf 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/PublisherAnnotationPostProcessor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/PublisherAnnotationPostProcessor.java
@@ -28,7 +28,7 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.integration.annotation.Publisher;
+import org.springframework.integration.aop.Publisher;
 import org.springframework.integration.aop.PublisherAnnotationAdvisor;
 import org.springframework.integration.channel.ChannelRegistry;
 import org.springframework.util.Assert;
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java
index e44413f7e9..cb1892467d 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 
 import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.integration.annotation.Publisher;
 import org.springframework.integration.channel.ChannelRegistry;
 import org.springframework.integration.channel.DefaultChannelRegistry;
 import org.springframework.integration.channel.QueueChannel;
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationTestBean.java b/org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationTestBean.java
index cacad2a509..d610ec0597 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationTestBean.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationTestBean.java
@@ -16,7 +16,6 @@
 
 package org.springframework.integration.aop;
 
-import org.springframework.integration.annotation.Publisher;
 
 
 /**