[jboss-cvs] jboss-portal/core/src/resources/portal-cms-sar/META-INF ...

Julien Viet julien at jboss.com
Tue Jul 11 09:59:01 EDT 2006


  User: julien  
  Date: 06/07/11 09:59:01

  Modified:    core/src/resources/portal-cms-sar/META-INF 
                        jboss-service.xml
  Log:
  unify hibernate config
  
  Revision  Changes    Path
  1.39      +21 -36    jboss-portal/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: jboss-service.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -b -r1.38 -r1.39
  --- jboss-service.xml	11 Jul 2006 13:27:05 -0000	1.38
  +++ jboss-service.xml	11 Jul 2006 13:59:01 -0000	1.39
  @@ -10,7 +10,7 @@
      </mbean-->
      
      <!--
  -      portal.single.xml.close@
  +      @portal.single.xml.close@
         
      <mbean
         code="org.jboss.portal.cms.impl.cache.CMSTreeCacheServiceImpl"
  @@ -50,7 +50,7 @@
         </depends-list>
      </mbean>
      
  -      portal.single.xml.open@
  +   @portal.single.xml.open@
      -->
      
      <mbean
  @@ -62,12 +62,11 @@
         <!-- The datasource hibernate depends on, it can be commented when the file store is used -->
         <depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
         <depends>portal:service=JAASLoginModule</depends>
  -      <depends>portal:service=CMS,hibernateSessionFactory=CMSHibernateStoreSessionFactory</depends>
  -      <depends>portal:service=CMS,hibernateSessionFactory=CMSHibernatePersistenceManagerSessionFactory</depends>
  +      <depends>portal:service=Hibernate,type=CMS</depends>
         <!--
  -         portal.single.xml.close@
  +         @portal.single.xml.close@
            <depends optional-attribute-name="CmsStack" proxy-type="attribute">portal:service=InterceptorStack,type=Cms</depends>
  -         portal.single.xml.open@
  +      @portal.single.xml.open@
         -->
         <attribute name="DoChecking">true</attribute>
         <attribute name="DefaultContentLocation">portal/cms/conf/default-content/default/</attribute>
  @@ -83,8 +82,8 @@
   
               <!-- HibernateStore: uses RDBMS + Hibernate for storage -->
               <FileSystem class="org.jboss.portal.cms.hibernate.HibernateStore">
  -               <param name="schemaObjectPrefix" value="CMSEntry"/>
  -               <param name="jndiName" value="java:portal/cms/StoreSessionFactory"/>
  +               <param name="schemaObjectPrefix" value="RepositoryEntry"/>
  +               <param name="JNDIName" value="java:/portal/cms/CMSSessionFactory"/>
               </FileSystem>
   
               <!-- LocalFileSystem: uses FileSystem for storage. -->
  @@ -107,7 +106,7 @@
                  <!-- HibernateStore: uses RDBMS + Hibernate for storage -->
                  <FileSystem class="org.jboss.portal.cms.hibernate.HibernateStore">
                     <param name="schemaObjectPrefix" value="CMSEntry"/>
  -                  <param name="jndiName" value="java:portal/cms/StoreSessionFactory"/>
  +                  <param name="JNDIName" value="java:portal/cms/CMSSessionFactory"/>
                  </FileSystem>
                  <!-- LocalFileSystem: uses FileSystem for storage. -->
                  <!--<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
  @@ -122,7 +121,7 @@
                  <!-- HibernatePersistentManager: uses RDBMS + Hibernate for storage -->
                  <PersistenceManager class="org.jboss.portal.cms.hibernate.state.HibernatePersistenceManager">
                     <param name="schemaObjectPrefix" value="WSP"/>
  -                  <param name="jndiName" value="java:portal/cms/PMSessionFactory"/>
  +                  <param name="JNDIName" value="java:portal/cms/CMSSessionFactory"/>
                     <param name="externalBLOBs" value="false"/>
                  </PersistenceManager>
                  
  @@ -151,7 +150,7 @@
                  <!-- HibernateStore: uses RDBMS + Hibernate for storage -->
                  <FileSystem class="org.jboss.portal.cms.hibernate.HibernateStore">
                     <param name="schemaObjectPrefix" value="VersionEntry"/>
  -                  <param name="jndiName" value="java:portal/cms/StoreSessionFactory"/>
  +                  <param name="JNDIName" value="java:portal/cms/CMSSessionFactory"/>
                  </FileSystem>
                  
                  <!-- LocalFileSystem: uses FileSystem for storage. -->
  @@ -169,7 +168,7 @@
                  <!-- HibernatePersistentManager: uses RDBMS + Hibernate for storage -->
                  <PersistenceManager class="org.jboss.portal.cms.hibernate.state.HibernatePersistenceManager">
                     <param name="schemaObjectPrefix" value="Version"/>
  -                  <param name="jndiName" value="java:portal/cms/PMSessionFactory"/>
  +                  <param name="JNDIName" value="java:portal/cms/CMSSessionFactory"/>
                     <param name="externalBLOBs" value="false"/>
                  </PersistenceManager>
                  
  @@ -224,30 +223,16 @@
      @portal.single.xml.open@
      -->
   
  -   <mbean code="org.jboss.portal.cms.hibernate.jmx.HibernateStore" 
  -      name="portal:service=CMS,hibernateSessionFactory=CMSHibernateStoreSessionFactory">
  -      <depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
  -      <attribute name="Datasource">java:@portal.datasource.name@</attribute>
  -      <attribute name="Isolation">2</attribute>
  -      <attribute name="Batch_size">0</attribute>
  -      <attribute name="Auto">update</attribute>
  -      <attribute name="Autocommit">false</attribute>
  -      <attribute name="Provider_class">org.hibernate.cache.HashtableCacheProvider</attribute>
  -      <attribute name="JndiName">java:portal/cms/StoreSessionFactory</attribute>
  -      <!--<attribute name="Dialect">org.hibernate.dialect.MySQLDialect</attribute>-->
  -   </mbean>
  -
  -   <mbean code="org.jboss.portal.cms.hibernate.jmx.HibernatePersistenceManager" 
  -      name="portal:service=CMS,hibernateSessionFactory=CMSHibernatePersistenceManagerSessionFactory">
  +   <mbean
  +      code="org.jboss.portal.core.hibernate.SessionFactoryBinder"
  +      name="portal:service=Hibernate,type=CMS"
  +      xmbean-dd=""
  +      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
  +      <xmbean/>
         <depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
  -      <attribute name="Datasource">java:@portal.datasource.name@</attribute>
  -      <attribute name="Isolation">2</attribute>
  -      <attribute name="Batch_size">0</attribute>
  -      <attribute name="Auto">update</attribute>
  -      <attribute name="Autocommit">false</attribute>
  -      <attribute name="Provider_class">org.hibernate.cache.HashtableCacheProvider</attribute>
  -      <attribute name="JndiName">java:portal/cms/PMSessionFactory</attribute>
  -      <!--<attribute name="Dialect">org.hibernate.dialect.MySQLDialect</attribute>-->
  +      <attribute name="DoChecking">true</attribute>
  +      <attribute name="ConfigLocation">conf/hibernate/cms/hibernate.cfg.xml</attribute>
  +      <attribute name="JNDIName">java:/portal/cms/CMSSessionFactory</attribute>
      </mbean>
      
   
  @@ -258,7 +243,7 @@
         xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
         <xmbean/>
         <attribute name="Prefix">content</attribute>
  -      <attribute name="TargetWindowRef">default.default.CMSPortletWindow</attribute>
  +      <attribute name="TargetWindowRef">default.default.DefaultCMSPortletWindow</attribute>
         <depends optional-attribute-name="Factory" proxy-type="attribute">portal:commandFactory=Delegating</depends>
         <depends optional-attribute-name="CMSService" proxy-type="attribute">portal:service=CMS</depends>
      </mbean>
  
  
  



More information about the jboss-cvs-commits mailing list