Author: shuber
Date: Fri Sep 14 10:47:33 2007
New Revision: 18440
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18440&repname=
=3Djahia
Log:
EHCache now activated by default. We still need to properly size the caches=
and test in clustering.
Modified:
trunk/core/src/conf/java/ehcache-hibernate.xml
trunk/core/src/conf/java/ehcache-jahia.xml
trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-hibernate.x=
ml
trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-services.xml
Modified: trunk/core/src/conf/java/ehcache-hibernate.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/ehcache-hibernate.xml&rev=3D18440&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/conf/java/ehcache-hibernate.xml (original)
+++ trunk/core/src/conf/java/ehcache-hibernate.xml Fri Sep 14 10:47:33 2007
@@ -256,28 +256,53 @@
created programmtically using CacheManager.add(String cacheName)
-->
<defaultCache
- maxElementsInMemory=3D"7000"
- eternal=3D"true"
- timeToIdleSeconds=3D"120"
- timeToLiveSeconds=3D"120"
- overflowToDisk=3D"true"
- maxElementsOnDisk=3D"10000000"
- diskPersistent=3D"true"
- diskExpiryThreadIntervalSeconds=3D"480"
+ maxElementsInMemory=3D"1000"
+ eternal=3D"false"
+ timeToIdleSeconds=3D"3600"
+ timeToLiveSeconds=3D"14400"
+ overflowToDisk=3D"false"
+ maxElementsOnDisk=3D"1000000"
+ diskPersistent=3D"false"
+ diskExpiryThreadIntervalSeconds=3D"600"
memoryStoreEvictionPolicy=3D"LRU"
- />
+ >
+ <!-- Uncomment this to activate clustering
+ <cacheEventListenerFactory class=3D"net.sf.ehcache.distribution.RM=
ICacheReplicatorFactory"
+ properties=3D"replicateAsynchronously=3Dtrue,
+ replicatePuts=3Dfalse,
+ replicateUpdates=3Dtrue,
+ replicateUpdatesViaCopy=3Dfalse,
+ replicateRemovals=3Dtrue
+ asynchronousReplicationIntervalMillis=3D5000"/>
+ <bootstrapCacheLoaderFactory
+ class=3D"net.sf.ehcache.distribution.RMIBootstrapCacheLoaderFactor=
y"
+ properties=3D"bootstrapAsynchronously=3Dtrue, maximumChunkSizeByte=
s=3D5000000"/>
+ -->
+ </defaultCache>
=
<cache
name=3D"org.hibernate.cache.StandardQueryCache"
- maxElementsInMemory=3D"5"
+ maxElementsInMemory=3D"1000"
eternal=3D"false"
- timeToLiveSeconds=3D"120"
overflowToDisk=3D"true"/> =
=
<cache
name=3D"org.hibernate.cache.UpdateTimestampsCache"
maxElementsInMemory=3D"5000"
eternal=3D"true"
- overflowToDisk=3D"true"/>
+ overflowToDisk=3D"true">
+ <!-- Uncomment this to activate clustering
+ <cacheEventListenerFactory class=3D"net.sf.ehcache.distribution.RM=
ICacheReplicatorFactory"
+ properties=3D"replicateAsynchronously=3Dtrue,
+ replicatePuts=3Dtrue,
+ replicateUpdates=3Dtrue,
+ replicateUpdatesViaCopy=3Dtrue,
+ replicateRemovals=3Dtrue
+ asynchronousReplicationIntervalMillis=3D5000"/>
+ <bootstrapCacheLoaderFactory
+ class=3D"net.sf.ehcache.distribution.RMIBootstrapCacheLoaderFactor=
y"
+ properties=3D"bootstrapAsynchronously=3Dtrue, maximumChunkSizeByte=
s=3D5000000"/>
+ -->
+ </cache>
=
</ehcache>
Modified: trunk/core/src/conf/java/ehcache-jahia.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/ehcache-jahia.xml&rev=3D18440&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/conf/java/ehcache-jahia.xml (original)
+++ trunk/core/src/conf/java/ehcache-jahia.xml Fri Sep 14 10:47:33 2007
@@ -256,16 +256,29 @@
created programmtically using CacheManager.add(String cacheName)
-->
<defaultCache
- maxElementsInMemory=3D"2000"
- eternal=3D"true"
- timeToIdleSeconds=3D"120"
- timeToLiveSeconds=3D"120"
- overflowToDisk=3D"true"
- maxElementsOnDisk=3D"10000000"
- diskPersistent=3D"true"
- diskExpiryThreadIntervalSeconds=3D"480"
+ maxElementsInMemory=3D"3000"
+ eternal=3D"false"
+ timeToIdleSeconds=3D"3600"
+ timeToLiveSeconds=3D"14400"
+ overflowToDisk=3D"false"
+ maxElementsOnDisk=3D"1000000"
+ diskPersistent=3D"false"
+ diskExpiryThreadIntervalSeconds=3D"600"
memoryStoreEvictionPolicy=3D"LRU"
- />
+ >
+ <!-- Uncomment this to activate clustering
+ <cacheEventListenerFactory class=3D"net.sf.ehcache.distribution.RM=
ICacheReplicatorFactory"
+ properties=3D"replicateAsynchronously=3Dtrue,
+ replicatePuts=3Dfalse,
+ replicateUpdates=3Dtrue,
+ replicateUpdatesViaCopy=3Dfalse,
+ replicateRemovals=3Dtrue
+ asynchronousReplicationIntervalMillis=3D5000"/>
+ <bootstrapCacheLoaderFactory
+ class=3D"net.sf.ehcache.distribution.RMIBootstrapCacheLoaderFactor=
y"
+ properties=3D"bootstrapAsynchronously=3Dtrue, maximumChunkSizeByte=
s=3D5000000"/>
+ -->
+ </defaultCache> =
=
<cache
name=3D"jahia.descriptor"
@@ -318,16 +331,20 @@
overflowToDisk=3D"false"/>
=
<cache
- name=3D"JahiaAclPermissionsCache"
- maxElementsInMemory=3D"1000"
- eternal=3D"true"
- timeToIdleSeconds=3D"120"
- timeToLiveSeconds=3D"120"
- overflowToDisk=3D"true"
- maxElementsOnDisk=3D"10000000"
- diskPersistent=3D"true"
- diskExpiryThreadIntervalSeconds=3D"480"
- memoryStoreEvictionPolicy=3D"LRU"
- />
+ name=3D"HTMLCache"
+ overflowToDisk=3D"true"
+ diskPersistent=3D"true" />
+ <cache
+ name=3D"HTMLCache-groups"
+ overflowToDisk=3D"true"
+ diskPersistent=3D"true" />
+ <cache
+ name=3D"ContainerHTMLCache"
+ overflowToDisk=3D"true"
+ diskPersistent=3D"true" />
+ <cache
+ name=3D"ContainerHTMLCache-groups"
+ overflowToDisk=3D"true"
+ diskPersistent=3D"true" />
=
</ehcache>
Modified: trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-hiber=
nate.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/etc/spring/applicationcontext-hibernate.xml&rev=3D18440&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-hibernate.x=
ml (original)
+++ trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-hibernate.x=
ml Fri Sep 14 10:47:33 2007
@@ -124,10 +124,10 @@
<!-- prop key=3D"hibernate.cache.provider_class">org.jahia=
.hibernate.cache.TreeCacheProvider</prop-->
<!-- prop key=3D"hibernate.cache.provider_class">org.jahia=
.hibernate.cache.JahiaClusterCacheHibernateProvider</prop-->
<!--prop key=3D"hibernate.cache.provider_class">org.jahia.=
hibernate.cache.JahiaBatchingClusterCacheHibernateProvider</prop-->
- <!--prop key=3D"hibernate.cache.provider_class">net.sf.ehc=
ache.hibernate.EhCacheProvider</prop-->
- <prop key=3D"hibernate.cache.provider_class">org.jahia.hib=
ernate.cache.JahiaBatchingClusterCacheHibernateProvider</prop>
+ <prop key=3D"hibernate.cache.provider_class">net.sf.ehcach=
e.hibernate.EhCacheProvider</prop>
+ <!--prop key=3D"hibernate.cache.provider_class">org.jahia.=
hibernate.cache.JahiaBatchingClusterCacheHibernateProvider</prop-->
<!-- If you use an invalidation-based cache, make sure you=
turn the query cache off ! -->
- <prop key=3D"hibernate.cache.use_query_cache">false</prop>
+ <prop key=3D"hibernate.cache.use_query_cache">true</prop>
<!-- put the batch size property to 0 if you need to debug=
-->
<prop key=3D"hibernate.jdbc.batch_size">16</prop>
<prop key=3D"hibernate.default_batch_fetch_size">16</prop>
Modified: trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-servi=
ces.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/etc/spring/applicationcontext-services.xml&rev=3D18440&repname=3Dj=
ahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-services.xm=
l (original)
+++ trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-services.xm=
l Fri Sep 14 10:47:33 2007
@@ -65,13 +65,15 @@
<!--bean id=3D"org.jahia.services.cache.CacheProvider" class=3D"org.ja=
hia.services.cache.clusterservice.batch.BatchingClusterServiceCacheProvider=
"-->
<!-- Uncomment this to use JOTM Transaction Manager with Tomcat and co=
mment the other -->
<!--bean id=3D"org.jahia.services.cache.CacheProvider" class=3D"org.ja=
hia.services.cache.treecache.TreeCacheProvider" /-->
- <!--bean id=3D"org.jahia.services.cache.CacheProvider" class=3D"org.ja=
hia.services.cache.ehcache.EhCacheProvider" /-->
-
+<!--
<bean id=3D"org.jahia.services.cache.CacheProvider" class=3D"org.jahia=
.services.cache.clusterservice.batch.BatchingClusterServiceCacheProvider">
<property name=3D"clusterService">
<ref bean=3D"ClusterService" />
</property>
</bean>
+ -->
+ <bean id=3D"org.jahia.services.cache.CacheProvider" class=3D"org.jahia=
.services.cache.ehcache.EhCacheProvider"/>
+
=
<bean id=3D"JahiaCacheService" parent=3D"proxyTemplate">
<property name=3D"target">
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
