Author: thomas.heute(a)jboss.com Date: 2010-02-25 09:08:50 -0500 (Thu, 25 Feb 2010) New Revision: 1865 Modified: portal/branches/tmp_thomas_perf/component/common/src/main/java/conf/configuration-jboss.properties portal/branches/tmp_thomas_perf/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java portal/branches/tmp_thomas_perf/packaging/module/src/main/javascript/portal.packaging.module.js portal/branches/tmp_thomas_perf/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml Log: test Modified: portal/branches/tmp_thomas_perf/component/common/src/main/java/conf/configuration-jboss.properties =================================================================== --- portal/branches/tmp_thomas_perf/component/common/src/main/java/conf/configuration-jboss.properties 2010-02-25 13:47:01 UTC (rev 1864) +++ portal/branches/tmp_thomas_perf/component/common/src/main/java/conf/configuration-jboss.properties 2010-02-25 14:08:50 UTC (rev 1865) @@ -24,7 +24,7 @@ gatein.db.data.dir=${gatein.data.dir}/db # JCR -gatein.jcr.config.type=local +gatein.jcr.config.type=cluster gatein.jcr.datasource.name=java:jdbcjcr gatein.jcr.datasource.dialect=auto Modified: portal/branches/tmp_thomas_perf/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java =================================================================== --- portal/branches/tmp_thomas_perf/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java 2010-02-25 13:47:01 UTC (rev 1864) +++ portal/branches/tmp_thomas_perf/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java 2010-02-25 14:08:50 UTC (rev 1865) @@ -47,7 +47,7 @@ public <V> V execute(POMSession session, POMTask<V> task) throws Exception { - if (task instanceof CacheableDataTask && !cluster) + if (task instanceof CacheableDataTask) { CacheableDataTask<?, V> loadTask = (CacheableDataTask<?, V>)task; switch (loadTask.getAccessMode()) Modified: portal/branches/tmp_thomas_perf/packaging/module/src/main/javascript/portal.packaging.module.js =================================================================== --- portal/branches/tmp_thomas_perf/packaging/module/src/main/javascript/portal.packaging.module.js 2010-02-25 13:47:01 UTC (rev 1864) +++ portal/branches/tmp_thomas_perf/packaging/module/src/main/javascript/portal.packaging.module.js 2010-02-25 14:08:50 UTC (rev 1865) @@ -163,6 +163,7 @@ addDependency(kernel.component.remote). addDependency(kernel.component.cache). addDependency(kernel.component.command). + addDependency(new Project("org.exoplatform.kernel", "exo.kernel.component.ext.cache.impl.jboss.v3", "jar", kernel.version)). addDependency(core.component.database). addDependency(core.component.organization). Modified: portal/branches/tmp_thomas_perf/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml =================================================================== --- portal/branches/tmp_thomas_perf/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-02-25 13:47:01 UTC (rev 1864) +++ portal/branches/tmp_thomas_perf/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-02-25 14:08:50 UTC (rev 1865) @@ -194,6 +194,17 @@ </component-plugins> </component> + <component> + <key>org.exoplatform.services.cache.ExoCacheFactory</key> + <type>org.exoplatform.services.cache.impl.jboss.ExoCacheFactoryImpl</type> + <init-params> + <value-param> + <name>cache.config.template</name> + <value>classpath:/conf/jcr/jbosscache/cluster/config.xml</value> + </value-param> + </init-params> + </component> + <external-component-plugins> <target-component>org.exoplatform.services.organization.OrganizationService</target-component> <component-plugin> @@ -263,4 +274,42 @@ </component-plugin> </external-component-plugins> + <external-component-plugins> + <target-component>org.exoplatform.services.cache.ExoCacheFactory</target-component> + <component-plugin> + <name>addCreator</name> + <set-method>addCreator</set-method> + <type>org.exoplatform.services.cache.impl.jboss.ExoCacheCreatorPlugin</type> + <description>add Exo Cache Creator</description> + <init-params> + <object-param> + <name>LRU</name> + <description>The LRU cache creator</description> + <object type="org.exoplatform.services.cache.impl.jboss.lru.LRUExoCacheCreator"></object> + </object-param> + </init-params> + </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.PomSessionManager</name> + <description>The JBoss Cache LRU configuration</description> + <object type="org.exoplatform.services.cache.impl.jboss.lru.LRUExoCacheConfig"> + <field name="name"><string>PomSessionManager</string></field> + <field name="maxNodes"><int>-1</int></field> + <field name="minTimeToLive"><long>0</long></field> + </object> + </object-param> + </init-params> + </component-plugin> + </external-component-plugins> + </configuration>