[portal-commits] JBoss Portal SVN: r5868 - in trunk/cms: . src/main/org/jboss/portal/cms/impl/jcr src/resources/hibernate

[portal-commits at lists.jboss.org]

Author: sohil.shah at jboss.com
Date: 2006-12-14 21:59:56 -0500 (Thu, 14 Dec 2006)
New Revision: 5868

Modified:
   trunk/cms/build.xml
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java
   trunk/cms/src/resources/hibernate/domain.hbm.xml
Log:
fix for the cms testsuite failure

Modified: trunk/cms/build.xml
===================================================================
--- trunk/cms/build.xml	2006-12-15 02:34:28 UTC (rev 5867)
+++ trunk/cms/build.xml	2006-12-15 02:59:56 UTC (rev 5868)
@@ -435,6 +435,8 @@
             <path refid="jackrabbit.jackrabbit.classpath"/>
 			<path refid="jboss.cache.classpath"/>
 			<path refid="jgroups.jgroups.classpath"/>
+			<!-- fine grained security integration -->
+			 <path refid="jboss.portal-identity.classpath"/>
          </x-classpath>
       </execute-tests>
    </target>

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java	2006-12-15 02:34:28 UTC (rev 5867)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java	2006-12-15 02:59:56 UTC (rev 5868)
@@ -304,12 +304,18 @@
       
       //make the user executing these to create the default content, an 'Admin' user
       //without this, the fine grained security won't allow the creation 
-      org.hibernate.Session session = org.jboss.portal.cms.hibernate.state.Tools.getOpenSession();
-      org.hibernate.Transaction tx = session.beginTransaction();
-      User user = this.userModule.findUserByUserName("admin");
-      this.getUserInfo().set(user);
-      tx.rollback();
-      org.jboss.portal.cms.hibernate.state.Tools.closeSession(session);
+      if(this.userModule != null)
+      {
+	      org.hibernate.Session session = org.jboss.portal.cms.hibernate.state.Tools.getOpenSession();
+	      org.hibernate.Transaction tx = session.beginTransaction();
+	      User user = this.userModule.findUserByUserName("admin");
+	      if(user!=null)
+	      {
+	    	  JCRCMS.getUserInfo().set(user);
+	      }
+	      tx.rollback();
+	      org.jboss.portal.cms.hibernate.state.Tools.closeSession(session);
+      }
 
       // Iterate over the content
       URLVisitor visitor = new URLVisitor()

Modified: trunk/cms/src/resources/hibernate/domain.hbm.xml
===================================================================
--- trunk/cms/src/resources/hibernate/domain.hbm.xml	2006-12-15 02:34:28 UTC (rev 5867)
+++ trunk/cms/src/resources/hibernate/domain.hbm.xml	2006-12-15 02:59:56 UTC (rev 5868)
@@ -277,6 +277,7 @@
    
    <!--  mapping to persist CMS Fine Grained Security related objects -->
    <class name="org.jboss.portal.cms.security.PermRoleAssoc" table="jbp_cms_perm_role">
+   		<cache usage="read-write"/> 
    		<id
          name="id"
          column="ID"
@@ -291,6 +292,7 @@
         />                               
    </class>
    <class name="org.jboss.portal.cms.security.PermUserAssoc" table="jbp_cms_perm_user">
+        <cache usage="read-write"/> 
    		<id
          name="id"
          column="ID"
@@ -304,7 +306,29 @@
          not-null="true"
         />                               
    </class>
+   <class name="org.jboss.portal.cms.security.Criteria" table="jbp_cms_perm_criteria">
+        <cache usage="read-write"/> 
+   		<id
+         name="id"
+         column="ID"
+         type="java.lang.Long">
+         <generator class="native"/>
+        </id>
+        <property
+         name="name"
+         column="NAME"
+         type="string"
+         not-null="true"
+        />
+        <property
+         name="value"
+         column="VALUE"
+         type="string"
+         not-null="true"
+        />               
+   </class>
    <class name="org.jboss.portal.cms.security.Permission" table="jbp_cms_perm">
+        <cache usage="read-write"/> 
    		<id
          name="id"
          column="ID"
@@ -312,22 +336,25 @@
          <generator class="native"/>
         </id>
         <!-- one-to-many association with the criteria object -->
-        <set name="criteria" lazy="true" table="jbp_cms_perm_criteria" cascade="all">
+        <set name="criteria" lazy="false" table="jbp_cms_perm_criteria" cascade="all-delete-orphan">
+            <cache usage="read-write"/> 
         	<key column="CMS_PERM_ID"/>
         	<one-to-many class="org.jboss.portal.cms.security.Criteria"/>
         </set>
         <!-- many-to-many association with the role object -->
-        <set name="roleAssoc" lazy="true" cascade="all">
+        <set name="roleAssoc" lazy="false" cascade="all-delete-orphan">
+            <cache usage="read-write"/> 
         	<key column="CMS_PERM_ID"/>
         	<one-to-many class="org.jboss.portal.cms.security.PermRoleAssoc"/>
         </set>
         <!-- many-to-many association with the user object -->
-        <set name="userAssoc" lazy="true" cascade="all">
+        <set name="userAssoc" lazy="false" cascade="all-delete-orphan">
+            <cache usage="read-write"/> 
         	<key column="CMS_PERM_ID"/>
         	<one-to-many class="org.jboss.portal.cms.security.PermUserAssoc"/>
         </set>
         <property
-         name="name"
+         name="service"
          column="NAME"
          type="string"
          not-null="true"
@@ -345,25 +372,5 @@
          not-null="true"         
         />        
    </class>
-   <class name="org.jboss.portal.cms.security.Criteria" table="jbp_cms_perm_criteria">
-   		<id
-         name="id"
-         column="ID"
-         type="java.lang.Long">
-         <generator class="native"/>
-        </id>
-        <property
-         name="name"
-         column="NAME"
-         type="string"
-         not-null="true"
-        />
-        <property
-         name="value"
-         column="VALUE"
-         type="string"
-         not-null="true"
-        />               
-   </class>   
 </hibernate-mapping>