[portal-commits] JBoss Portal SVN: r11808 - in branches/JBoss_Portal_Branch_2_7: core and 5 other directories.

Author: prabhat.jha(a)jboss.com Date: 2008-09-04 11:12:02 -0400 (Thu, 04 Sep 2008) New Revision: 11808 Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml branches/JBoss_Portal_Branch_2_7/core/build.xml branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml Log: [JBPORTAL-2149]mergigng changes from Branch26 Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-09-04 13:32:25 UTC (rev 11807) +++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-09-04 15:12:02 UTC (rev 11808) @@ -120,9 +120,13 @@ <componentref name="portlet" version="2.0-Draft32"/> <componentref name="sun-jstl" version="1.2"/> <componentref name="jboss/web" version="2.1.0.GA"/> + + <!-- To use new jboss-cahce/hibernate integration library--> + <componentref name="org/jboss/cluster/hibernate-jbc-cacheprovider" version="1.0.0.GA"/> + </build> - <synchronizeinfo/> + <synchronizeinfo/> <target name="generate-lib-file" description="generate libraries.ent and thirdparty license info" Modified: branches/JBoss_Portal_Branch_2_7/core/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-09-04 13:32:25 UTC (rev 11807) +++ branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-09-04 15:12:02 UTC (rev 11808) @@ -378,6 +378,11 @@ </filterset> <fileset dir="${build.resources}/jboss-portal" includes="**/*.xml"/> </copy> + + <!-- add jboss-cache-hibernate integration jar --> + <copy todir="${build.resources}/jboss-portal-ha.sar/lib"> + <fileset dir="${org/jboss/cluster/hibernate.jbc.cacheprovider.root}/lib" includes="hibernate-jbc-cacheprovider.jar"/> + </copy> <implode dir="${build.resources}/jboss-portal-ha.sar" Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-09-04 13:32:25 UTC (rev 11807) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-09-04 15:12:02 UTC (rev 11808) @@ -428,9 +428,11 @@ org.jboss.cache.JBossTransactionManagerLookup </attribute> - <attribute name="NodeLockingScheme">PESSIMISTIC</attribute> - <attribute name="IsolationLevel">REPEATABLE_READ</attribute> + <attribute name="NodeLockingScheme">OPTIMISTIC</attribute> + <attribute name="IsolationLevel">READ_COMMITTED</attribute> + <attribute name="CacheMode">INVALIDATION_SYNC</attribute> + <attribute name="CacheMode">REPL_SYNC</attribute> <attribute name="ClusterName"> @@ -499,13 +501,7 @@ </config> </attribute> </mbean> - - <mbean code="org.jboss.portal.jems.hibernate.JBossTreeCacheProvider" - name="portal:service=TreeCacheProvider,type=hibernate"> - <depends optional-attribute-name="CacheName"> - portal:service=TreeCache,type=hibernate - </depends> - </mbean> + @portal.single.xml.open@ --> @@ -513,10 +509,7 @@ <mbean code="org.jboss.portal.jems.hibernate.SessionFactoryBinder" name="portal:service=Hibernate" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends> - <!-- Uncomment in clustered mode : hibernate depends on its tree cache service @portal.single.xml.close@ - <depends>portal:service=TreeCacheProvider,type=hibernate</depends> - @portal.single.xml.open@ --> + <depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends> <attribute name="DoChecking">true</attribute> <attribute name="ConfigLocation">conf/hibernate/user/hibernate.cfg.xml</attribute> <attribute name="SetupLocation">conf/hibernate/user/setup.txt</attribute> @@ -526,10 +519,6 @@ xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends> - <depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends> - <!-- Uncomment in clustered mode : hibernate depends on its tree cache service @portal.single.xml.close@ - <depends>portal:service=TreeCacheProvider,type=hibernate</depends> - @portal.single.xml.open@ --> <attribute name="DoChecking">true</attribute> <attribute name="ConfigLocation">conf/hibernate/instance/hibernate.cfg.xml</attribute> <attribute name="JNDIName">java:/portal/InstanceSessionFactory</attribute> @@ -538,9 +527,6 @@ xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends> - <!-- Uncomment in clustered mode : hibernate depends on its tree cache service @portal.single.xml.close@ - <depends>portal:service=TreeCacheProvider,type=hibernate</depends> - @portal.single.xml.open@ --> <attribute name="DoChecking">true</attribute> <attribute name="ConfigLocation">conf/hibernate/portal/hibernate.cfg.xml</attribute> <attribute name="JNDIName">java:/portal/PortalObjectSessionFactory</attribute> @@ -548,10 +534,7 @@ <mbean code="org.jboss.portal.jems.hibernate.SessionFactoryBinder" name="portal:service=Hibernate,type=Portlet" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends> - <!-- Uncomment in clustered mode : hibernate depends on its tree cache service @portal.single.xml.close@ - <depends>portal:service=TreeCacheProvider,type=hibernate</depends> - @portal.single.xml.open@ --> + <depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends> <attribute name="DoChecking">true</attribute> <attribute name="ConfigLocation">conf/hibernate/portlet/hibernate.cfg.xml</attribute> <attribute name="JNDIName">java:/portal/PortletSessionFactory</attribute> Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml 2008-09-04 13:32:25 UTC (rev 11807) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml 2008-09-04 15:12:02 UTC (rev 11808) @@ -30,14 +30,14 @@ <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">true</property> - <property name="cache.use_query_cache">true</property> + <property name="cache.use_query_cache">false</property> <property name="hibernate.hbm2ddl.auto">update</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.object_name">portal:service=TreeCacheProvider,type=hibernate</property> + <property name="cache.provider_class">org.jboss.hibernate.jbc.cacheprovider.JmxBoundTreeCacheProvider</property> + <property name="treecache.mbean.object_name">portal:service=TreeCache,type=hibernate</property> @portal.single.xml.open@ --> Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml 2008-09-04 13:32:25 UTC (rev 11807) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml 2008-09-04 15:12:02 UTC (rev 11808) @@ -55,7 +55,7 @@ inverse="true" cascade="none" fetch="select" - lazy="extra"> + lazy="true"> <cache usage=&quot;@portal.hibernate.cache.usage(a)&quot;/&gt; <key column="PARENT_KEY"/> <map-key @@ -105,11 +105,16 @@ column="LISTENER"/> <map name="displayNames" + cascade="none" + fetch="select" + lazy="true" table="JBP_PORTAL_OBJECT_DNAMES"> + <cache usage=&quot;@portal.hibernate.cache.usage(a)&quot;/&gt; <key column="INSTANCE_PK"/> <map-key type="locale" column="LOCALE"/> - <element type="string" column="TEXT"/> - </map> + <element type="string" column="TEXT"/> + </map> + <map name="declaredPropertyMap" cascade="all-delete-orphan" Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml 2008-09-04 13:32:25 UTC (rev 11807) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml 2008-09-04 15:12:02 UTC (rev 11808) @@ -30,13 +30,13 @@ <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">true</property> - <property name="cache.use_query_cache">true</property> + <property name="cache.use_query_cache">false</property> <property name="hibernate.hbm2ddl.auto">update</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.object_name">portal:service=TreeCacheProvider,type=hibernate</property> + <property name="cache.provider_class">org.jboss.hibernate.jbc.cacheprovider.JmxBoundTreeCacheProvider</property> + <property name="treecache.mbean.object_name">portal:service=TreeCache,type=hibernate</property> @portal.single.xml.open@ --> Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml 2008-09-04 13:32:25 UTC (rev 11807) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml 2008-09-04 15:12:02 UTC (rev 11808) @@ -30,13 +30,13 @@ <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">true</property> - <property name="cache.use_query_cache">true</property> + <property name="cache.use_query_cache">false</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.object_name">portal:service=TreeCacheProvider,type=hibernate</property> + <property name="cache.provider_class">org.jboss.hibernate.jbc.cacheprovider.JmxBoundTreeCacheProvider</property> + <property name="treecache.mbean.object_name">portal:service=TreeCache,type=hibernate</property> @portal.single.xml.open@ --> Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml 2008-09-04 13:32:25 UTC (rev 11807) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml 2008-09-04 15:12:02 UTC (rev 11808) @@ -30,13 +30,13 @@ <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">true</property> - <property name="cache.use_query_cache">true</property> + <property name="cache.use_query_cache">false</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.object_name">portal:service=TreeCacheProvider,type=hibernate</property> + <property name="cache.provider_class">org.jboss.hibernate.jbc.cacheprovider.JmxBoundTreeCacheProvider</property> + <property name="treecache.mbean.object_name">portal:service=TreeCache,type=hibernate</property> @portal.single.xml.open@ -->