From 3a5bed212467697fccd7c02f68d480ec8a59026e Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Sun, 6 Mar 2011 18:19:19 +0000
Subject: [PATCH] + revert back deleted resource

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4068 50f2f4bb-b051-0410-bef5-90022cba6387
---
 .../cache/config/annotation-cache-aspectj.xml              | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename org.springframework.aspects/src/test/{resources => java}/org/springframework/cache/config/annotation-cache-aspectj.xml (93%)

diff --git a/org.springframework.aspects/src/test/resources/org/springframework/cache/config/annotation-cache-aspectj.xml b/org.springframework.aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml
similarity index 93%
rename from org.springframework.aspects/src/test/resources/org/springframework/cache/config/annotation-cache-aspectj.xml
rename to org.springframework.aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml
index 9877eba813c..512bdd52375 100644
--- a/org.springframework.aspects/src/test/resources/org/springframework/cache/config/annotation-cache-aspectj.xml
+++ b/org.springframework.aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml
@@ -16,11 +16,12 @@
 		<property name="cacheDefinitionSources" ref="annotationSource"/>
 	</bean>
 	
+	<!-- 
 	<bean id="advisor" class="org.springframework.cache.interceptor.BeanFactoryCacheDefinitionSourceAdvisor">
 		<property name="cacheDefinitionSource" ref="annotationSource"/>
-		<property name="adviceBeanName" value="cacheInterceptor"/>
+		<property name="adviceBeanName" value="cacheAspect"/>
 	</bean>
-	
+	 -->
 
 	<bean id="cacheManager" class="org.springframework.cache.support.MapCacheManager">
 		<property name="caches">
@@ -35,4 +36,4 @@
 	<bean id="service" class="org.springframework.cache.config.DefaultCacheableService"/>
 	<bean id="classService" class="org.springframework.cache.config.AnnotatedClassCacheableService"/>
 
-</beans>
+</beans>
\ No newline at end of file