Author: hfnukal Date: 2012-07-02 16:36:34 -0400 (Mon, 02 Jul 2012) New Revision: 8761 Modified: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties 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/local/config.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml Log: Bug 837029 - Change of JBC configuration - LRU algorithm + separate configuration for portal-system workspace Modified: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties 2012-07-02 20:36:34 UTC (rev 8761) @@ -32,6 +32,7 @@ gatein.jcr.data.dir=${gatein.data.dir}/jcr gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values gatein.jcr.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml +gatein.jcr.cache.config.workspace.portal-system=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config_portal-system.xml gatein.jcr.lock.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/lucene gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter 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-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml 2012-07-02 20:36:34 UTC (rev 8761) @@ -30,11 +30,11 @@ <!-- Eviction configuration --> <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" + <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="minTimeToLive" value="20000"/> + <property name="maxNodes" value="10000"/> + <property name="timeToLive" value="60000"/> </default> </eviction> </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-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml 2012-07-02 20:36:34 UTC (rev 8761) @@ -28,11 +28,11 @@ <!-- Eviction configuration --> <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" + <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="minTimeToLive" value="20000"/> + <property name="maxNodes" value="10000"/> + <property name="timeToLive" value="60000"/> </default> </eviction> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2012-07-02 20:36:34 UTC (rev 8761) @@ -126,7 +126,7 @@ </initializer> <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config.workspace.portal-system}" /> <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> <property name="jgroups-multiplexer-stack" value="false" /> <property name="jbosscache-cluster-name" value="jcr${container.name.suffix}" />