Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Privilege.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Privilege.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Privilege.java	(revision af7bc7f9e66df064739240f751ba03ffdc74795f)
@@ -0,0 +1,114 @@
+package org.lamsfoundation.lams.usermanagement;
+
+import java.io.Serializable;
+import java.util.Set;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+
+/** 
+ *        @hibernate.class
+ *         table="lams_privilege"
+ *     
+*/
+public class Privilege implements Serializable {
+
+    /** identifier field */
+    private Long privilegeId;
+
+    /** persistent field */
+    private String code;
+
+    /** nullable persistent field */
+    private String description;
+
+    /** persistent field */
+    private Set rolePrivileges;
+
+    /** full constructor */
+    public Privilege(String code, String description, Set rolePrivileges) {
+        this.code = code;
+        this.description = description;
+        this.rolePrivileges = rolePrivileges;
+    }
+
+    /** default constructor */
+    public Privilege() {
+    }
+
+    /** minimal constructor */
+    public Privilege(String code, Set rolePrivileges) {
+        this.code = code;
+        this.rolePrivileges = rolePrivileges;
+    }
+
+    /** 
+     *            @hibernate.id
+     *             generator-class="native"
+     *             type="java.lang.Long"
+     *             column="privilege_id"
+     *         
+     */
+    public Long getPrivilegeId() {
+        return this.privilegeId;
+    }
+
+    public void setPrivilegeId(Long privilegeId) {
+        this.privilegeId = privilegeId;
+    }
+
+    /** 
+     *            @hibernate.property
+     *             column="code"
+     *             unique="true"
+     *             length="10"
+     *             not-null="true"
+     *         
+     */
+    public String getCode() {
+        return this.code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    /** 
+     *            @hibernate.property
+     *             column="description"
+     *             length="255"
+     *         
+     */
+    public String getDescription() {
+        return this.description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    /** 
+     *            @hibernate.set
+     *             lazy="true"
+     *             inverse="true"
+     *             cascade="delete-orphan"
+     *            @hibernate.collection-key
+     *             column="privilege_id"
+     *            @hibernate.collection-one-to-many
+     *             class="org.lamsfoundation.lams.usermanagement.RolePrivilege"
+     *         
+     */
+    public Set getRolePrivileges() {
+        return this.rolePrivileges;
+    }
+
+    public void setRolePrivileges(Set rolePrivileges) {
+        this.rolePrivileges = rolePrivileges;
+    }
+
+    public String toString() {
+        return new ToStringBuilder(this)
+            .append("privilegeId", getPrivilegeId())
+            .toString();
+    }
+
+}
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java
===================================================================
diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -raf7bc7f9e66df064739240f751ba03ffdc74795f
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java	(.../Role.java)	(revision 34b959260a0f8f8285793a4481a95ca3580eabc5)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java	(.../Role.java)	(revision af7bc7f9e66df064739240f751ba03ffdc74795f)
@@ -78,6 +78,9 @@
     /** persistent field */
     private Set userOrganisationRoles;
 
+    /** persistent field */
+    private Set rolePrivileges;
+
     /** full constructor */
     public Role(String name, String description, Set userOrganisationRoles) {
         this.name = name;
@@ -143,7 +146,7 @@
      *            @hibernate.set
      *             lazy="true"
      *             inverse="true"
-     *             cascade="none"
+     *             cascade="delete-orphan"
      *            @hibernate.collection-key
      *             column="role_id"
      *            @hibernate.collection-one-to-many
@@ -157,7 +160,27 @@
     public void setUserOrganisationRoles(Set userOrganisationRoles) {
         this.userOrganisationRoles = userOrganisationRoles;
     }
-    public void addUserOrganisationRole(UserOrganisationRole userOrganisationRole){
+    
+    /** 
+     *            @hibernate.set
+     *             lazy="true"
+     *             inverse="true"
+     *             cascade="delete-orphan"
+     *            @hibernate.collection-key
+     *             column="role_id"
+     *            @hibernate.collection-one-to-many
+     *             class="org.lamsfoundation.lams.usermanagement.RolePrivilege"
+     *         
+     */
+    public Set getRolePrivileges() {
+		return rolePrivileges;
+	}
+
+	public void setRolePrivileges(Set rolePrivileges) {
+		this.rolePrivileges = rolePrivileges;
+	}
+
+	public void addUserOrganisationRole(UserOrganisationRole userOrganisationRole){
     	if(userOrganisationRoles==null)
     		userOrganisationRoles = new HashSet();
     	userOrganisationRoles.add(userOrganisationRole);
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/RolePrivilege.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/RolePrivilege.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/RolePrivilege.java	(revision af7bc7f9e66df064739240f751ba03ffdc74795f)
@@ -0,0 +1,82 @@
+package org.lamsfoundation.lams.usermanagement;
+
+import java.io.Serializable;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+
+/** 
+ *        @hibernate.class
+ *         table="lams_role_privilege"
+ *     
+*/
+public class RolePrivilege implements Serializable {
+
+    /** identifier field */
+    private Long rpId;
+
+    /** persistent field */
+    private org.lamsfoundation.lams.usermanagement.Privilege privilege;
+
+    /** persistent field */
+    private org.lamsfoundation.lams.usermanagement.Role role;
+
+    /** full constructor */
+    public RolePrivilege(org.lamsfoundation.lams.usermanagement.Privilege privilege, org.lamsfoundation.lams.usermanagement.Role role) {
+        this.privilege = privilege;
+        this.role = role;
+    }
+
+    /** default constructor */
+    public RolePrivilege() {
+    }
+
+    /** 
+     *            @hibernate.id
+     *             generator-class="native"
+     *             type="java.lang.Long"
+     *             column="rp_id"
+     *         
+     */
+    public Long getRpId() {
+        return this.rpId;
+    }
+
+    public void setRpId(Long rpId) {
+        this.rpId = rpId;
+    }
+
+    /** 
+     *            @hibernate.many-to-one
+     *             not-null="true"
+     *            @hibernate.column name="privilege_id"         
+     *         
+     */
+    public org.lamsfoundation.lams.usermanagement.Privilege getPrivilege() {
+        return this.privilege;
+    }
+
+    public void setPrivilege(org.lamsfoundation.lams.usermanagement.Privilege privilege) {
+        this.privilege = privilege;
+    }
+
+    /** 
+     *            @hibernate.many-to-one
+     *             not-null="true"
+     *            @hibernate.column name="role_id"         
+     *         
+     */
+    public org.lamsfoundation.lams.usermanagement.Role getRole() {
+        return this.role;
+    }
+
+    public void setRole(org.lamsfoundation.lams.usermanagement.Role role) {
+        this.role = role;
+    }
+
+    public String toString() {
+        return new ToStringBuilder(this)
+            .append("rpId", getRpId())
+            .toString();
+    }
+
+}