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

[do-not-reply at jboss.org]

Author: hoang_to
Date: 2011-10-26 06:17:49 -0400 (Wed, 26 Oct 2011)
New Revision: 7891

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-26 09:21:58 UTC (rev 7890)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml	2011-10-26 10:17:49 UTC (rev 7891)
@@ -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>${cache.config.default.maxSize:300}</int></field>
-          <field name="liveTime"><long>${cache.config.default.liveTime:600}</long></field>
+          <field name="maxSize"><int>${gatein.cache.default.maxsize:300}</int></field>
+          <field name="liveTime"><long>${gatein.cache.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-26 09:21:58 UTC (rev 7890)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml	2011-10-26 10:17:49 UTC (rev 7891)
@@ -334,10 +334,10 @@
               <string>MOPSessionManager</string>
             </field>
             <field name="maxSize">
-              <int>${cache.config.MOPSessionManager.maxSize:5000}</int>
+              <int>${gatein.cache.mop.maxsize:5000}</int>
             </field>
             <field name="liveTime">
-              <long>${cache.config.MOPSessionManager.liveTime:600}</long>
+              <long>${gatein.cache.mop.livetime:600}</long>
             </field>
             <field name="implementation">
               <string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string>  	
@@ -360,10 +360,10 @@
               <string>MOPSessionManager</string>
             </field>
             <field name="expirationTimeout">
-              <long>${cache.config.MOPSessionManager.expirationTimeout:600000}</long>
+              <long>${gatein.cache.mop.expiration:600000}</long>
             </field>
             <field name="maxNodes">
-             <int>${cache.config.MOPSessionManager.maxNodes:5000}</int>
+             <int>${gatein.cache.mop.maxnodes:5000}</int>
             </field>
             <field name="distributed">
               <boolean>true</boolean>
@@ -388,10 +388,10 @@
               <string>NavigationService</string>
             </field>
             <field name="maxSize">
-              <int>${cache.config.NavigationService.maxSize:5000}</int>
+              <int>${gatein.cache.navigation.maxsize:5000}</int>
             </field>
             <field name="liveTime">
-              <long>${cache.config.NavigationService.liveTime:600}</long>
+              <long>${gatein.cache.navigation.livetime:600}</long>
             </field>
             <field name="implementation">
               <string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string>   
@@ -414,10 +414,10 @@
               <string>NavigationService</string>
             </field>
             <field name="expirationTimeout">
-              <long>${cache.config.NavigationService.expirationTimeout:600000}</long>
+              <long>${gatein.cache.navigation.expiration:600000}</long>
             </field>
             <field name="maxNodes">
-             <int>${cache.config.NavigationService.maxNodes:5000}</int>
+             <int>${gatein.cache.navigation.maxnodes:5000}</int>
             </field>
             <field name="distributed">
               <boolean>true</boolean>
@@ -442,10 +442,10 @@
               <string>DescriptionService</string>
             </field>
             <field name="maxSize">
-              <int>${cache.config.DescriptionService.maxSize:5000}</int>
+              <int>${gatein.cache.description.maxsize:5000}</int>
             </field>
             <field name="liveTime">
-              <long>${cache.config.DescriptionService.liveTime:600}</long>
+              <long>${gatein.cache.description.livetime:600}</long>
             </field>
             <field name="implementation">
               <string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string>   
@@ -468,10 +468,10 @@
               <string>DescriptionService</string>
             </field>
             <field name="expirationTimeout">
-              <long>${cache.config.DescriptionService.expirationTimeout:600000}</long>
+              <long>${gatein.cache.description.expiration:600000}</long>
             </field>
             <field name="maxNodes">
-             <int>${cache.config.DescriptionService.maxNodes:5000}</int>
+             <int>${gatein.cache.description.maxnodes:5000}</int>
             </field>
             <field name="distributed">
               <boolean>true</boolean>