[DS-3823] Give distinct names to the services and Hibernate cache managers.

dspace-services/src/main/resources/spring/spring-dspace-core-services.xml

@@ -39,7 +39,8 @@
     <bean id="org.dspace.caching.ehcache.CacheManager"
           class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
         <property name="configLocation">
-            <bean class="org.dspace.servicemanager.spring.ResourceFinder" factory-method="getResourceFromPaths">
+            <bean class="org.dspace.servicemanager.spring.ResourceFinder"
+                  factory-method="getResourceFromPaths">
                 <constructor-arg>
                     <list>
                         <value>ehcache-config.xml</value>
@@ -48,7 +49,8 @@
                 </constructor-arg>
             </bean>
         </property>
-        <property name="shared" value="true"/>
+        <property name='acceptExisting' value='true'/>
+        <property name='cacheManagerName' value='org.dspace.services'/>
     </bean>
     <!-- CACHING end beans -->
 

dspace/config/hibernate-ehcache-config.xml

@@ -10,7 +10,8 @@
 -->
 <ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="ehcache.xsd"
-         updateCheck='false'>
+         updateCheck='false'
+         name='org.dspace.hibernate'>
 
     <diskStore path="java.io.tmpdir"/>
 

dspace/config/hibernate.cfg.xml

@@ -21,7 +21,7 @@
         <!--Second level cache configuration-->
         <property name="hibernate.cache.use_query_cache">true</property>
         <property name="hibernate.cache.use_second_level_cache">true</property>
-        <property name="hibernate.cache.region.factory_class">org.hibernate.cache.ehcache.SingletonEhCacheRegionFactory</property>
+        <property name="hibernate.cache.region.factory_class">org.hibernate.cache.ehcache.EhCacheRegionFactory</property>
         <property name="hibernate.cache.use_structured_entries">true</property>
         <property name="javax.persistence.sharedCache.mode">ENABLE_SELECTIVE</property>
         <!-- Set in config/spring/api/core-hibernate.xml -->