Index: core-module/src/main/resources/egovframework/spring/com/context-properties.xml
===================================================================
diff -u -r70c3913bb82d0427ac5dc3d14f2b0b2f8e530b59 -r85bbbeda825b4c98730a13f3bd9a30c15a99a234
--- core-module/src/main/resources/egovframework/spring/com/context-properties.xml	(.../context-properties.xml)	(revision 70c3913bb82d0427ac5dc3d14f2b0b2f8e530b59)
+++ core-module/src/main/resources/egovframework/spring/com/context-properties.xml	(.../context-properties.xml)	(revision 85bbbeda825b4c98730a13f3bd9a30c15a99a234)
@@ -27,11 +27,11 @@
         </property>
     </bean>
 
-    <cache:annotation-driven cache-manager="ehcacheManager"/>
-    <bean id="ehcacheManager" class="org.springframework.cache.ehcache.EhCacheCacheManager">
-        <property name="cacheManager" ref="ehcache"/>
+    <cache:annotation-driven cache-manager="customEhCacheManager"/>
+    <bean id="customEhCacheManager" class="org.springframework.cache.ehcache.EhCacheCacheManager">
+        <property name="cacheManager" ref="customEhcacheManager"/>
     </bean>
-    <bean id="ehcache" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
+    <bean id="customEhcacheManager" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
         <property name="configLocation" value="classpath:/ehcache.xml"/>
         <property name="shared" value="true"/>
     </bean>