From 8fb6790f7d412ced9acb22221f4ad693c03ed1f3 Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Fri, 13 May 2011 16:09:33 +0000
Subject: [PATCH] SPR-8334 + commit missing configs

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4306 50f2f4bb-b051-0410-bef5-90022cba6387
---
 .../cache/config/annotationDrivenCacheConfig.xml                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.springframework.context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml b/org.springframework.context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml
index 93464bd8d49..58c625034da 100644
--- a/org.springframework.context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml
+++ b/org.springframework.context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml
@@ -26,7 +26,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"/>