[portal-commits] JBoss Portal SVN: r13041 - in branches/JBoss_Portal_AS5_Deployer: wsrp/src/resources/portal-wsrp-sar/conf/hibernate/consumer and 1 other directory.

Author: mwringe Date: 2009-03-16 18:28:29 -0400 (Mon, 16 Mar 2009) New Revision: 13041 Removed: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/ehcache.xml branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/conf/hibernate/consumer/ehcache.xml Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/conf/hibernate/consumer/hibernate.cfg.xml Log: Remove ehcache.xml files as they are no longer used with AS5. Re-enable second level cache using HashtableCacheProvider. Deleted: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/ehcache.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/ehcache.xml 2009-03-16 22:27:23 UTC (rev 13040) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/ehcache.xml 2009-03-16 22:28:29 UTC (rev 13041) @@ -1,61 +0,0 @@ -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ - ~ contributors as indicated by the @authors tag. See the ~ - ~ copyright.txt in the distribution for a full listing of ~ - ~ individual contributors. ~ - ~ ~ - ~ 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - -<ehcache> - - <!-- Sets the path to the directory where cache .data files are created. - - If the path is a Java System Property it is replaced by - its value in the running VM. - - The following properties are translated: - user.home - User's home directory - user.dir - User's current working directory - java.io.tmpdir - Default temp file path --> - <diskStore path="java.io.tmpdir/cms"/> - - - <!--Default Cache configuration. These will applied to caches programmatically created through - the CacheManager. - - The following attributes are required for defaultCache: - - maxInMemory - Sets the maximum number of objects that will be created in memory - eternal - Sets whether elements are eternal. If eternal, timeouts are ignored and the element - is never expired. - timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used - if the element is not eternal. Idle time is now - last accessed time - timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used - if the element is not eternal. TTL is now - creation time - overflowToDisk - Sets whether elements can overflow to disk when the in-memory cache - has reached the maxInMemory limit. - - --> - <defaultCache - maxElementsInMemory="10000" - eternal="false" - timeToIdleSeconds="1800" - timeToLiveSeconds="1800" - overflowToDisk="false" - /> -</ehcache> Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml 2009-03-16 22:27:23 UTC (rev 13040) +++ branches/JBoss_Portal_AS5_Deployer/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml 2009-03-16 22:28:29 UTC (rev 13041) @@ -31,13 +31,13 @@ <property name=&quot;show_sql&quot;&gt;@portal.sql.show(a)&lt;/property&gt; <!-- caching properties --> - <property name="cache.use_second_level_cache">false</property> - <property name="cache.use_query_cache">false</property> + <property name="cache.use_second_level_cache">true</property> + <property name="cache.use_query_cache">true</property> <!-- | Uncomment in clustered mode : use transactional replicated cache @portal.single.xml.close@ - <property name="cache.provider_class">org.jboss.hibernate.jbc.cacheprovider.JmxBoundTreeCacheProvider</property> + <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> <property name="treecache.mbean.object_name">portal:service=TreeCache,type=hibernate</property> @portal.single.xml.open@ --> @@ -45,8 +45,8 @@ <!-- | Comment in clustered mode @portal.clustered.xml.close@ - <property name="cache.provider_configuration_file_resource_path">conf/hibernate/portal/ehcache.xml</property> - <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property> + <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> + <property name="treecache.mbean.object_name">portal:service=TreeCache,type=hibernate</property> @portal.clustered.xml.open@ --> @@ -62,4 +62,4 @@ <!-- Mapping files --> <mapping resource="conf/hibernate/cms/domain.hbm.xml"/> </session-factory> -</hibernate-configuration> +</hibernate-configuration> \ No newline at end of file Deleted: branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/conf/hibernate/consumer/ehcache.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/conf/hibernate/consumer/ehcache.xml 2009-03-16 22:27:23 UTC (rev 13040) +++ branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/conf/hibernate/consumer/ehcache.xml 2009-03-16 22:28:29 UTC (rev 13041) @@ -1,60 +0,0 @@ -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2007, Red Hat Middleware, LLC, and individual ~ - ~ contributors as indicated by the @authors tag. See the ~ - ~ copyright.txt in the distribution for a full listing of ~ - ~ individual contributors. ~ - ~ ~ - ~ 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<ehcache> - - <!-- Sets the path to the directory where cache .data files are created. - - If the path is a Java System Property it is replaced by - its value in the running VM. - - The following properties are translated: - user.home - User's home directory - user.dir - User's current working directory - java.io.tmpdir - Default temp file path --> - <diskStore path="java.io.tmpdir/wsrpconsumer"/> - - - <!--Default Cache configuration. These will applied to caches programmatically created through - the CacheManager. - - The following attributes are required for defaultCache: - - maxInMemory - Sets the maximum number of objects that will be created in memory - eternal - Sets whether elements are eternal. If eternal, timeouts are ignored and the element - is never expired. - timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used - if the element is not eternal. Idle time is now - last accessed time - timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used - if the element is not eternal. TTL is now - creation time - overflowToDisk - Sets whether elements can overflow to disk when the in-memory cache - has reached the maxInMemory limit. - - --> - <defaultCache - maxElementsInMemory="10000" - eternal="false" - timeToIdleSeconds="1800" - timeToLiveSeconds="1800" - overflowToDisk="false" - /> -</ehcache> \ No newline at end of file Modified: branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/conf/hibernate/consumer/hibernate.cfg.xml =================================================================== --- branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/conf/hibernate/consumer/hibernate.cfg.xml 2009-03-16 22:27:23 UTC (rev 13040) +++ branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/conf/hibernate/consumer/hibernate.cfg.xml 2009-03-16 22:28:29 UTC (rev 13041) @@ -28,13 +28,13 @@ <session-factory> <property name="connection.datasource">java:@portal.datasource.name@</property> <property name=&quot;show_sql&quot;&gt;@portal.sql.show(a)&lt;/property&gt; - <property name="cache.use_second_level_cache">false</property> - <property name="cache.use_query_cache">false</property> + <property name="cache.use_second_level_cache">true</property> + <property name="cache.use_query_cache">true</property> <!-- | Uncomment in clustered mode : use transactional replicated cache @portal.single.xml.close@ - <property name="cache.provider_class">org.jboss.portal.jems.hibernate.JMXTreeCacheProvider</property> + <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> <property name="cache.object_name">portal:service=TreeCacheProvider,type=hibernate</property> @portal.single.xml.open@ --> @@ -42,8 +42,8 @@ <!-- | Comment in clustered mode @portal.clustered.xml.close@ - <property name="cache.provider_configuration_file_resource_path">conf/consumer/hibernate/ehcache.xml</property> - <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property> + <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> + <property name="cache.object_name">portal:service=TreeCacheProvider,type=hibernate</property> @portal.clustered.xml.open@ --> @@ -55,4 +55,4 @@ <!-- Mapping files --> <mapping resource="conf/hibernate/consumer/domain.hbm.xml"/> </session-factory> -</hibernate-configuration> +</hibernate-configuration> \ No newline at end of file