7:11 a.m.
Author: julien_viet
Date: 2010-03-10 08:11:18 -0500 (Wed, 10 Mar 2010)
New Revision: 2101
Added:
portal/trunk/component/common/src/main/java/conf/jbosscache/
portal/trunk/component/common/src/main/java/conf/jbosscache/cluster/
portal/trunk/component/common/src/main/java/conf/jbosscache/cluster/config.xml
portal/trunk/component/common/src/main/java/conf/jbosscache/local/
portal/trunk/component/common/src/main/java/conf/jbosscache/local/config.xml
Modified:
portal/trunk/component/resources/src/main/java/org/exoplatform/services/resources/impl/SimpleResourceBundleService.java
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-770
Added: portal/trunk/component/common/src/main/java/conf/jbosscache/cluster/config.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jbosscache/cluster/config.xml
(rev 0)
+++
portal/trunk/component/common/src/main/java/conf/jbosscache/cluster/config.xml 2010-03-10
13:11:18 UTC (rev 2101)
@@ -0,0 +1,33 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
+
+ <!-- The cluster name should be changed by the kernel cache configuration -->
+ <clustering mode="replication" clusterName="changeme">
+ </clustering>
+
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"
eventQueueSize="1000000">
+ <property name="maxNodes" value="1000" />
+ <property name="timeToLive" value="120000" />
+ </default>
+ </eviction>
+
+</jbosscache>
\ No newline at end of file
Added: portal/trunk/component/common/src/main/java/conf/jbosscache/local/config.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jbosscache/local/config.xml
(rev 0)
+++
portal/trunk/component/common/src/main/java/conf/jbosscache/local/config.xml 2010-03-10
13:11:18 UTC (rev 2101)
@@ -0,0 +1,29 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
+
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"
eventQueueSize="1000000">
+ <property name="maxNodes" value="1000" />
+ <property name="timeToLive" value="120000" />
+ </default>
+ </eviction>
+
+</jbosscache>
\ No newline at end of file
Modified:
portal/trunk/component/resources/src/main/java/org/exoplatform/services/resources/impl/SimpleResourceBundleService.java
===================================================================
---
portal/trunk/component/resources/src/main/java/org/exoplatform/services/resources/impl/SimpleResourceBundleService.java 2010-03-10
12:39:20 UTC (rev 2100)
+++
portal/trunk/component/resources/src/main/java/org/exoplatform/services/resources/impl/SimpleResourceBundleService.java 2010-03-10
13:11:18 UTC (rev 2101)
@@ -55,7 +55,7 @@
{
log_ = ExoLogger.getLogger("org.exoplatform.services.resources");
localeService_ = localeService;
- cache_ = cService.getCacheInstance(ResourceBundleData.class.getName());
+ cache_ = cService.getCacheInstance(ResourceBundleData.class.getSimpleName());
initParams(params);
}
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 2010-03-10
12:39:20 UTC (rev 2100)
+++
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2010-03-10
13:11:18 UTC (rev 2101)
@@ -22,8 +22,8 @@
<configuration
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd
http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd
http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
<component>
<key>org.jboss.cache.transaction.TransactionManagerLookup</key>
@@ -113,7 +113,7 @@
<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>60</long></field>
+ <field
name="liveTime"><long>600</long></field>
<field
name="distributed"><boolean>false</boolean></field>
<field
name="implementation"><string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string></field>
</object>
@@ -127,8 +127,12 @@
<init-params>
<value-param>
<name>cache.config.template</name>
- <value>classpath:/conf/jcr/jbosscache/cluster/config.xml</value>
+ <value>classpath:/conf/jbosscache/cluster/config.xml</value>
</value-param>
+ <value-param profiles="cluster">
+ <name>cache.config.template</name>
+ <value>classpath:/conf/jbosscache/cluster/config.xml</value>
+ </value-param>
</init-params>
</component>
@@ -193,31 +197,4 @@
</component-plugin>
</external-component-plugins>
- <external-component-plugins>
-
<target-component>org.exoplatform.services.cache.CacheService</target-component>
- <component-plugin>
- <name>addExoCacheConfig</name>
- <set-method>addExoCacheConfig</set-method>
- <type>org.exoplatform.services.cache.ExoCacheConfigPlugin</type>
- <description>add Exo Cache Config</description>
- <init-params>
- <object-param>
- <name>cache.config.TemplateService</name>
- <description>The JBoss Cache LRU configuration</description>
- <object type="org.exoplatform.services.cache.ExoCacheConfig">
- <field name="name">
- <string>TemplateService</string>
- </field>
- <field name="liveTime">
- <long>600000</long>
- </field>
- <field name="maxSize">
- <int>1000</int>
- </field>
- </object>
- </object-param>
- </init-params>
- </component-plugin>
- </external-component-plugins>
-
</configuration>
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 2010-03-10
12:39:20 UTC (rev 2100)
+++
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-03-10
13:11:18 UTC (rev 2101)
@@ -273,7 +273,7 @@
<type>org.exoplatform.services.cache.ExoCacheConfigPlugin</type>
<description>add Exo Cache Config</description>
<init-params>
- <object-param>
+ <object-param profiles="cluster">
<name>cache.config.POMSessionManager</name>
<description>The JBoss Cache LRU configuration</description>
<object
type="org.exoplatform.services.cache.impl.jboss.lru.LRUExoCacheConfig">