Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved the @Publisher annotation into the 'aop' package to avoid a cycle.

Browse Source
This commit is contained in:
Mark Fisher
2008-08-20 04:42:43 +00:00
parent 2d57bee9d5
commit 218b100ab7
5 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
org.springframework.integration/src/main/java/org/springframework/integration/annotation/Publisher.java → org.springframework.integration/src/main/java/org/springframework/integration/aop/Publisher.java
View File

@@ -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.

1
org.springframework.integration/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java
View File

@@ -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;

2
org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/PublisherAnnotationPostProcessor.java
View File

@@ -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;

1
org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java
View File

@@ -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;

1
org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationTestBean.java
View File

@@ -16,7 +16,6 @@
package org.springframework.integration.aop;
import org.springframework.integration.annotation.Publisher;
/**