hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark H. Wood
2019-04-05 16:55:28 -04:00
parent 1e6497f1d6
commit b9ca1deb42
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dspace-services/src/main/resources/spring/spring-dspace-core-services.xml
View File

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

3
dspace/config/hibernate-ehcache-config.xml
View File

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

2
dspace/config/hibernate.cfg.xml
View File

@@ -21,7 +21,7 @@
<!--Second level cache configuration--> <!--Second level cache configuration-->
<property name="hibernate.cache.use_query_cache">true</property> <property name="hibernate.cache.use_query_cache">true</property>
<property name="hibernate.cache.use_second_level_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="hibernate.cache.use_structured_entries">true</property>
<property name="javax.persistence.sharedCache.mode">ENABLE_SELECTIVE</property> <property name="javax.persistence.sharedCache.mode">ENABLE_SELECTIVE</property>
<!-- Set in config/spring/api/core-hibernate.xml --> <!-- Set in config/spring/api/core-hibernate.xml -->