From cc519e7c6d6a74e1549a08f57a0929de02bad0a9 Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Fri, 13 May 2011 15:59:22 +0000
Subject: [PATCH] SPR-8334 + commit missing configs

---
 .../springframework/cache/config/annotation-cache-aspectj.xml   | 2 +-
 .../cache/config/annotationDrivenCacheNamespace.xml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.springframework.aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml b/org.springframework.aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml
index 512bdd5237..eb42f971e2 100644
--- a/org.springframework.aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml
+++ b/org.springframework.aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml
@@ -23,7 +23,7 @@
 	</bean>
 	 -->
 
-	<bean id="cacheManager" class="org.springframework.cache.support.MapCacheManager">
+	<bean id="cacheManager" class="org.springframework.cache.support.SimpleCacheManager">
 		<property name="caches">
 			<set>
 				<bean class="org.springframework.cache.concurrent.ConcurrentCacheFactoryBean" p:name="default"/>
diff --git a/org.springframework.context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml b/org.springframework.context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml
index d8b87d79b8..f296fdfddd 100644
--- a/org.springframework.context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml
+++ b/org.springframework.context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml
@@ -13,7 +13,7 @@
 		<aop:advisor advice-ref="debugInterceptor" pointcut="execution(* *..CacheableService.*(..))" order="1"/>
 	</aop:config>
 	
-	<bean id="cacheManager" class="org.springframework.cache.support.MapCacheManager">
+	<bean id="cacheManager" class="org.springframework.cache.support.SimpleCacheManager">
 		<property name="caches">
 			<set>
 				<bean class="org.springframework.cache.concurrent.ConcurrentCacheFactoryBean" p:name="default"/>