Author: chris.laprun(a)jboss.com Date: 2012-03-01 07:44:21 -0500 (Thu, 01 Mar 2012) New Revision: 8520 Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/indexer-config.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/lock-config.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/lock-config.xml Log: - GTNPORTAL-2366: Update outdated cache and clustering setup. Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml 2012-03-01 12:41:22 UTC (rev 8519) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml 2012-03-01 12:44:21 UTC (rev 8520) @@ -29,12 +29,12 @@ </clustering> <!-- Eviction configuration --> - <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" - actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" - eventQueueSize="1000000"> - <property name="maxNodes" value="5000" /> - <property name="timeToLive" value="20000" /> - </default> - </eviction> + <eviction wakeUpInterval="5000"> + <default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm" + actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" + eventQueueSize="1000000"> + <property name="maxNodes" value="20000"/> + <property name="warnNoExpirationKey" value="false"/> + </default> + </eviction> </jbosscache> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/indexer-config.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/indexer-config.xml 2012-03-01 12:41:22 UTC (rev 8519) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/indexer-config.xml 2012-03-01 12:44:21 UTC (rev 8520) @@ -29,12 +29,4 @@ <jgroupsConfig configFile="jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml" /> <sync /> </clustering> - <!-- Eviction configuration --> - <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000"> - <property name="maxNodes" value="5000" /> - <property name="minTimeToLive" value="20000" /> - </default> - </eviction> - </jbosscache> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/lock-config.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/lock-config.xml 2012-03-01 12:41:22 UTC (rev 8519) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/lock-config.xml 2012-03-01 12:44:21 UTC (rev 8520) @@ -31,7 +31,7 @@ <preload> <node fqn="/" /> </preload> - <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false" + <loader class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.JDBCCacheLoader" async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> <properties> cache.jdbc.table.name=${jbosscache-cl-cache.jdbc.table.name} @@ -44,7 +44,7 @@ cache.jdbc.node.type=${jbosscache-cl-cache.jdbc.node.type} cache.jdbc.parent.column=${jbosscache-cl-cache.jdbc.parent.column} cache.jdbc.datasource=${jbosscache-cl-cache.jdbc.datasource} - </properties> + </properties> </loader> </loaders> </jbosscache> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml 2012-03-01 12:41:22 UTC (rev 8519) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml 2012-03-01 12:44:21 UTC (rev 8520) @@ -28,9 +28,11 @@ <!-- Eviction configuration --> <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" eventQueueSize="1000000"> - <property name="maxNodes" value="5000" /> - <property name="minTimeToLive" value="20000" /> + <default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm" + actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" + eventQueueSize="1000000"> + <property name="maxNodes" value="20000"/> + <property name="warnNoExpirationKey" value="false"/> </default> </eviction> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/lock-config.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/lock-config.xml 2012-03-01 12:41:22 UTC (rev 8519) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/lock-config.xml 2012-03-01 12:44:21 UTC (rev 8520) @@ -24,7 +24,7 @@ <preload> <node fqn="/" /> </preload> - <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false" + <loader class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.JDBCCacheLoader" async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> <properties> cache.jdbc.table.name=${jbosscache-cl-cache.jdbc.table.name} @@ -37,7 +37,7 @@ cache.jdbc.node.type=${jbosscache-cl-cache.jdbc.node.type} cache.jdbc.parent.column=${jbosscache-cl-cache.jdbc.parent.column} cache.jdbc.datasource=${jbosscache-cl-cache.jdbc.datasource} - </properties> + </properties> </loader> </loaders> </jbosscache>