Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/AuthenticationMethod.hbm.xml
===================================================================
diff -u -re15632ff64e3683ae0e6a1860abbd79cb677224a -r317ace727d6603af8374bf14e47e0a2991a1816f
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/AuthenticationMethod.hbm.xml	(.../AuthenticationMethod.hbm.xml)	(revision e15632ff64e3683ae0e6a1860abbd79cb677224a)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/AuthenticationMethod.hbm.xml	(.../AuthenticationMethod.hbm.xml)	(revision 317ace727d6603af8374bf14e47e0a2991a1816f)
@@ -14,12 +14,10 @@
 <class 
     name="com.lamsinternational.lams.usermanagement.AuthenticationMethod" 
     table="lams_authentication_method"
-    proxy="com.lamsinternational.lams.usermanagement.AuthenticationMethod"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
         table="lams_authentication_method"
-        proxy="com.lamsinternational.lams.usermanagement.AuthenticationMethod"
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/AuthenticationMethodType.hbm.xml
===================================================================
diff -u -r4b196cccfe15e110611808070d9387e0bb35a8d9 -r317ace727d6603af8374bf14e47e0a2991a1816f
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/AuthenticationMethodType.hbm.xml	(.../AuthenticationMethodType.hbm.xml)	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/AuthenticationMethodType.hbm.xml	(.../AuthenticationMethodType.hbm.xml)	(revision 317ace727d6603af8374bf14e47e0a2991a1816f)
@@ -14,12 +14,10 @@
 <class 
     name="com.lamsinternational.lams.usermanagement.AuthenticationMethodType" 
     table="lams_authentication_method_type"
-    proxy="com.lamsinternational.lams.usermanagement.AuthenticationMethodType"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
         table="lams_authentication_method_type"
-        proxy="com.lamsinternational.lams.usermanagement.AuthenticationMethodType"
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Organisation.hbm.xml
===================================================================
diff -u -r3243ccb499dce210aa4990de05e97846a24c0df6 -r317ace727d6603af8374bf14e47e0a2991a1816f
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision 3243ccb499dce210aa4990de05e97846a24c0df6)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision 317ace727d6603af8374bf14e47e0a2991a1816f)
@@ -18,7 +18,6 @@
     <meta attribute="class-description" inherit="false">
        @hibernate.class
         table="lams_organisation"
-        proxy="com.lamsinternational.lams.usermanagement.Organisation"
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/OrganisationType.hbm.xml
===================================================================
diff -u -r4b196cccfe15e110611808070d9387e0bb35a8d9 -r317ace727d6603af8374bf14e47e0a2991a1816f
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/OrganisationType.hbm.xml	(.../OrganisationType.hbm.xml)	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/OrganisationType.hbm.xml	(.../OrganisationType.hbm.xml)	(revision 317ace727d6603af8374bf14e47e0a2991a1816f)
@@ -14,7 +14,6 @@
 <class 
     name="com.lamsinternational.lams.usermanagement.OrganisationType" 
     table="lams_organisation_type"
-    proxy="com.lamsinternational.lams.usermanagement.OrganisationType"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Role.hbm.xml
===================================================================
diff -u -r3243ccb499dce210aa4990de05e97846a24c0df6 -r317ace727d6603af8374bf14e47e0a2991a1816f
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Role.hbm.xml	(.../Role.hbm.xml)	(revision 3243ccb499dce210aa4990de05e97846a24c0df6)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Role.hbm.xml	(.../Role.hbm.xml)	(revision 317ace727d6603af8374bf14e47e0a2991a1816f)
@@ -18,7 +18,6 @@
     <meta attribute="class-description" inherit="false">
        @hibernate.class
         table="lams_role"
-        proxy="com.lamsinternational.lams.usermanagement.Role"
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/User.hbm.xml
===================================================================
diff -u -rf01c1b7b44db4f0994cb22ec8d7c9c2418f8679c -r317ace727d6603af8374bf14e47e0a2991a1816f
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision f01c1b7b44db4f0994cb22ec8d7c9c2418f8679c)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision 317ace727d6603af8374bf14e47e0a2991a1816f)
@@ -14,12 +14,10 @@
 <class 
     name="com.lamsinternational.lams.usermanagement.User" 
     table="lams_user"
-    proxy="com.lamsinternational.lams.usermanagement.User"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
         table="lams_user"
-        proxy="com.lamsinternational.lams.usermanagement.User"
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/UserOrganisation.hbm.xml
===================================================================
diff -u -r3243ccb499dce210aa4990de05e97846a24c0df6 -r317ace727d6603af8374bf14e47e0a2991a1816f
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/UserOrganisation.hbm.xml	(.../UserOrganisation.hbm.xml)	(revision 3243ccb499dce210aa4990de05e97846a24c0df6)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/UserOrganisation.hbm.xml	(.../UserOrganisation.hbm.xml)	(revision 317ace727d6603af8374bf14e47e0a2991a1816f)
@@ -18,7 +18,6 @@
     <meta attribute="class-description" inherit="false">
        @hibernate.class
         table="lams_user_organisation"
-        proxy="com.lamsinternational.lams.usermanagement.UserOrganisation"
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/UserOrganisationRole.hbm.xml
===================================================================
diff -u -r4b196cccfe15e110611808070d9387e0bb35a8d9 -r317ace727d6603af8374bf14e47e0a2991a1816f
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/UserOrganisationRole.hbm.xml	(.../UserOrganisationRole.hbm.xml)	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/UserOrganisationRole.hbm.xml	(.../UserOrganisationRole.hbm.xml)	(revision 317ace727d6603af8374bf14e47e0a2991a1816f)
@@ -14,12 +14,10 @@
 <class 
     name="com.lamsinternational.lams.usermanagement.UserOrganisationRole" 
     table="lams_user_organisation_role"
-    proxy="com.lamsinternational.lams.usermanagement.UserOrganisationRole"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
         table="lams_user_organisation_role"
-        proxy="com.lamsinternational.lams.usermanagement.UserOrganisationRole"
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Workspace.hbm.xml
===================================================================
diff -u -r4b196cccfe15e110611808070d9387e0bb35a8d9 -r317ace727d6603af8374bf14e47e0a2991a1816f
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Workspace.hbm.xml	(.../Workspace.hbm.xml)	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/Workspace.hbm.xml	(.../Workspace.hbm.xml)	(revision 317ace727d6603af8374bf14e47e0a2991a1816f)
@@ -14,12 +14,10 @@
 <class 
     name="com.lamsinternational.lams.usermanagement.Workspace" 
     table="lams_workspace"
-    proxy="com.lamsinternational.lams.usermanagement.Workspace"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
         table="lams_workspace"
-        proxy="com.lamsinternational.lams.usermanagement.Workspace"
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
Index: lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/WorkspaceFolder.hbm.xml
===================================================================
diff -u -r4b196cccfe15e110611808070d9387e0bb35a8d9 -r317ace727d6603af8374bf14e47e0a2991a1816f
--- lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/WorkspaceFolder.hbm.xml	(.../WorkspaceFolder.hbm.xml)	(revision 4b196cccfe15e110611808070d9387e0bb35a8d9)
+++ lams_common/conf/hibernate/mappings/com/lamsinternational/lams/usermanagement/WorkspaceFolder.hbm.xml	(.../WorkspaceFolder.hbm.xml)	(revision 317ace727d6603af8374bf14e47e0a2991a1816f)
@@ -14,12 +14,10 @@
 <class 
     name="com.lamsinternational.lams.usermanagement.WorkspaceFolder" 
     table="lams_workspace_folder"
-    proxy="com.lamsinternational.lams.usermanagement.WorkspaceFolder"
 >
     <meta attribute="class-description" inherit="false">
        @hibernate.class
         table="lams_workspace_folder"
-        proxy="com.lamsinternational.lams.usermanagement.WorkspaceFolder"
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>