Author: bpapez
Date: Tue Sep 18 15:26:39 2007
New Revision: 18547
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18547&repname=
=3Djahia
Log:
rollback EHCache usage, as Jahia is not ready yet for such an expiring cache
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/spring/applica=
tioncontext-hibernate.xml
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/spring/applica=
tioncontext-services.xml
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/spring/a=
pplicationcontext-hibernate.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/etc/spring/applicationcontext-hibernate.xml=
&rev=3D18547&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/spring/applica=
tioncontext-hibernate.xml (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/spring/applica=
tioncontext-hibernate.xml Tue Sep 18 15:26:39 2007
@@ -135,10 +135,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.ehcach=
e.hibernate.EhCacheProvider</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>
<!-- If you use an invalidation-based cache, make sure you=
turn the query cache off ! -->
- <prop key=3D"hibernate.cache.use_query_cache">true</prop>
+ <prop key=3D"hibernate.cache.use_query_cache">false</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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/spring/a=
pplicationcontext-services.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/etc/spring/applicationcontext-services.xml&=
rev=3D18547&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/spring/applica=
tioncontext-services.xml (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/spring/applica=
tioncontext-services.xml Tue Sep 18 15:26:39 2007
@@ -66,15 +66,13 @@
<!--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
