Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml	1 Sep 2006 05:48:10 -0000	1.1
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml	20 Sep 2006 02:43:58 -0000	1.2
@@ -73,10 +73,12 @@
         name="organisation"
         class="org.lamsfoundation.lams.usermanagement.Organisation"
         not-null="true"
+        lazy="false"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
             not-null="true"
+	        lazy="false"
            @hibernate.column name="classid"         
         </meta>
         <column name="classid" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/Attic/ExtServerOrgMap.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	1 Sep 2006 05:48:10 -0000	1.1
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	20 Sep 2006 02:43:58 -0000	1.2
@@ -214,11 +214,13 @@
         name="organisation"
         class="org.lamsfoundation.lams.usermanagement.Organisation"
         not-null="true"
+        lazy="false"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
             not-null="true"
-           @hibernate.column name="orgid"         
+           	lazy="false"         
+           @hibernate.column name="orgid"
         </meta>
         <column name="orgid" />
     </many-to-one>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/Attic/ExtUserUseridMap.hbm.xml,v
diff -u -r1.3 -r1.4
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml	13 Sep 2006 23:38:25 -0000	1.3
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml	20 Sep 2006 02:43:58 -0000	1.4
@@ -60,10 +60,12 @@
         name="user"
         class="org.lamsfoundation.lams.usermanagement.User"
         not-null="true"
+        lazy="false"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
             not-null="true"
+           	lazy="false"
            @hibernate.column name="user_id"         
         </meta>
         <column name="user_id" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml,v
diff -u -r1.13 -r1.14
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	6 Sep 2006 01:36:37 -0000	1.13
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	20 Sep 2006 02:44:12 -0000	1.14
@@ -173,10 +173,12 @@
         name="organisationState"
         class="org.lamsfoundation.lams.usermanagement.OrganisationState"
         not-null="true"
+        lazy="false"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
             not-null="true"
+        	lazy="false"
            @hibernate.column name="organisation_state_id"         
         </meta>
         <column name="organisation_state_id" />
@@ -187,12 +189,14 @@
         name="workspace"
         class="org.lamsfoundation.lams.usermanagement.Workspace"
         cascade="all"
+        lazy = "false"
         not-null="false"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
 			cascade="all"
             not-null="false"
+            lazy="false"
            @hibernate.column name="workspace_id"         
         </meta>
         <column name="workspace_id" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml,v
diff -u -r1.18 -r1.19
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	24 Aug 2006 01:32:23 -0000	1.18
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	20 Sep 2006 02:44:12 -0000	1.19
@@ -299,11 +299,13 @@
     <many-to-one
         name="workspace"
         cascade="all"
+        lazy="false"
         class="org.lamsfoundation.lams.usermanagement.Workspace"     
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
 	         cascade="all"
+	         lazy="false"
            @hibernate.column name="workspace_id"         
         </meta>
         <column name="workspace_id" />
@@ -312,11 +314,13 @@
     <set
         name="userOrganisations"
         inverse="true"
+        lazy="false"
 		cascade="all-delete-orphan"
     >
         <meta attribute="field-description">
            @hibernate.set
             inverse="true"
+            lazy="false"
             cascade="all-delete-orphan"
 
            @hibernate.collection-key
@@ -326,8 +330,6 @@
             class="org.lamsfoundation.lams.usermanagement.UserOrganisation"
         </meta>
         
-        <cache usage="transactional" />
-
         <key>
             <column name="user_id" />
         </key>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml,v
diff -u -r1.3 -r1.4
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml	14 Aug 2006 05:41:18 -0000	1.3
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml	20 Sep 2006 02:44:12 -0000	1.4
@@ -60,11 +60,13 @@
     <set
         name="userOrganisationRoles"
         inverse="true"
+        lazy = "false"
 		cascade="all-delete-orphan"
     >
         <meta attribute="field-description">
            @hibernate.set
             inverse="true"
+            lazy = "false"
             cascade="all-delete-orphan"
 
            @hibernate.collection-key
@@ -74,8 +76,6 @@
             class="org.lamsfoundation.lams.usermanagement.UserOrganisationRole"
         </meta>
         
-        <cache usage="transactional" />
-        
         <key>
             <column name="user_organisation_id" />
         </key>
@@ -88,11 +88,13 @@
         name="organisation"
         class="org.lamsfoundation.lams.usermanagement.Organisation"
         not-null="true"
+        lazy="false"
     >
         <meta attribute="use-in-equals">true</meta>
         <meta attribute="field-description">
            @hibernate.many-to-one
             not-null="true"
+	        lazy="false"
            @hibernate.column name="organisation_id"         
         </meta>
         <column name="organisation_id" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisationRole.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisationRole.hbm.xml,v
diff -u -r1.3 -r1.4
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisationRole.hbm.xml	14 Aug 2006 05:41:18 -0000	1.3
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisationRole.hbm.xml	20 Sep 2006 02:44:12 -0000	1.4
@@ -61,11 +61,13 @@
         name="role"
         class="org.lamsfoundation.lams.usermanagement.Role"
         not-null="true"
+        lazy="false"
     >
         <meta attribute="use-in-equals">true</meta>
         <meta attribute="field-description">
            @hibernate.many-to-one
             not-null="true"
+            lazy="false"
            @hibernate.column name="role_id"         
         </meta>
         <column name="role_id" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml,v
diff -u -r1.9 -r1.10
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml	7 Aug 2006 09:07:43 -0000	1.9
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml	20 Sep 2006 02:44:12 -0000	1.10
@@ -80,13 +80,13 @@
     <!-- bi-directional one-to-many association to WorkspaceFolder -->
     <set
         name="childWorkspaceFolders"
-        lazy="true"
+        lazy="false"
         inverse="true"
 		cascade="none"
     >
         <meta attribute="field-description">
            @hibernate.set
-            lazy="true"
+            lazy="false"
             inverse="true"
             cascade="none"