[gatein-commits] gatein SVN: r7858 - in portal/trunk/web/portal/src/main/webapp/WEB-INF/conf: portal and 1 other directory.

Author: hoang_to Date: 2011-10-25 04:45:58 -0400 (Tue, 25 Oct 2011) New Revision: 7858 Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml Log: GTNPORTAL-2197: Allow to tune caches easily Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2011-10-25 07:20:27 UTC (rev 7857) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2011-10-25 08:45:58 UTC (rev 7858) @@ -117,8 +117,8 @@ <description>The default cache configuration</description> <object type="org.exoplatform.services.cache.ExoCacheConfig"> <field name="name"><string>default</string></field> - <field name="maxSize"><int>300</int></field> - <field name="liveTime"><long>600</long></field> + <field name="maxSize"><int>${cache.config.default.maxSize:300}</int></field> + <field name="liveTime"><long>${cache.config.default.liveTime:600}</long></field> <field name="distributed"><boolean>false</boolean></field> <field name="implementation"><string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string></field> </object> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2011-10-25 07:20:27 UTC (rev 7857) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2011-10-25 08:45:58 UTC (rev 7858) @@ -334,10 +334,10 @@ <string>MOPSessionManager</string> </field> <field name="maxSize"> - <int>5000</int> + <int>${cache.config.MOPSessionManager.maxSize:5000}</int> </field> <field name="liveTime"> - <long>600</long> + <long>${cache.config.MOPSessionManager.liveTime:600}</long> </field> <field name="implementation"> <string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string> @@ -360,8 +360,11 @@ <string>MOPSessionManager</string> </field> <field name="expirationTimeout"> - <long>600</long> + <long>${cache.config.MOPSessionManager.expirationTimeout:600000}</long> </field> + <field name="maxNodes"> + <int>${cache.config.MOPSessionManager.maxNodes:5000}</int> + </field> <field name="distributed"> <boolean>true</boolean> </field> @@ -385,10 +388,10 @@ <string>NavigationService</string> </field> <field name="maxSize"> - <int>5000</int> + <int>${cache.config.NavigationService.maxSize:5000}</int> </field> <field name="liveTime"> - <long>600</long> + <long>${cache.config.NavigationService.liveTime:600}</long> </field> <field name="implementation"> <string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string> @@ -411,10 +414,10 @@ <string>NavigationService</string> </field> <field name="expirationTimeout"> - <long>600000</long> + <long>${cache.config.NavigationService.expirationTimeout:600000}</long> </field> <field name="maxNodes"> - <int>5000</int> + <int>${cache.config.NavigationService.maxNodes:5000}</int> </field> <field name="distributed"> <boolean>true</boolean> @@ -432,17 +435,17 @@ <description>add Exo Cache Config</description> <init-params> <object-param> - <name>cache.config.NavigationService</name> + <name>cache.config.DescriptionService</name> <description>The JBoss Cache configuration for the dezcription service</description> <object type="org.exoplatform.services.cache.ExoCacheConfig"> <field name="name"> <string>DescriptionService</string> </field> <field name="maxSize"> - <int>5000</int> + <int>${cache.config.DescriptionService.maxSize:5000}</int> </field> <field name="liveTime"> - <long>600</long> + <long>${cache.config.DescriptionService.liveTime:600}</long> </field> <field name="implementation"> <string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string> @@ -458,17 +461,17 @@ <description>add Exo Cache Config</description> <init-params> <object-param> - <name>cache.config.ConfigurationService</name> + <name>cache.config.DescriptionService</name> <description>The JBoss Cache configuration for the description service</description> <object type="org.exoplatform.services.cache.impl.jboss.ea.EAExoCacheConfig"> <field name="name"> <string>DescriptionService</string> </field> <field name="expirationTimeout"> - <long>600000</long> + <long>${cache.config.DescriptionService.expirationTimeout:600000}</long> </field> <field name="maxNodes"> - <int>5000</int> + <int>${cache.config.DescriptionService.maxNodes:5000}</int> </field> <field name="distributed"> <boolean>true</boolean>