Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Privilege.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Privilege.hbm.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Privilege.hbm.xml	31 May 2006 05:23:57 -0000	1.1
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="org.lamsfoundation.lams.usermanagement.Privilege" 
+    table="lams_privilege"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_privilege"
+    </meta>
+
+    <id
+        name="privilegeId"
+        type="java.lang.Long"
+        column="privilege_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="native"
+            type="java.lang.Long"
+            column="privilege_id"
+
+
+        </meta>
+        <generator class="native" />
+    </id>
+
+    <property
+        name="code"
+        type="java.lang.String"
+        column="code"
+        not-null="true"
+        unique="true"
+        length="10"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="code"
+            unique="true"
+            length="10"
+            not-null="true"
+        </meta>    
+    </property>
+    <property
+        name="description"
+        type="java.lang.String"
+        column="description"
+        length="255"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="description"
+            length="255"
+        </meta>    
+    </property>
+
+    <!-- Associations -->
+  
+    <!-- bi-directional one-to-many association to RolePrivilege -->
+    <set
+        name="rolePrivileges"
+        lazy="true"
+        inverse="true"
+		cascade="delete-orphan"
+    >
+        <meta attribute="field-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"
+        </meta>
+        <key>
+            <column name="privilege_id" />
+        </key>
+        <one-to-many 
+            class="org.lamsfoundation.lams.usermanagement.RolePrivilege"
+        />
+    </set>
+
+</class>
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Role.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Role.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Role.hbm.xml	6 Oct 2005 06:31:24 -0000	1.2
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Role.hbm.xml	31 May 2006 05:23:57 -0000	1.3
@@ -94,5 +94,32 @@
         />
     </set>
 
+    <!-- bi-directional one-to-many association to LamsRolePrivilege -->
+    <set
+        name="rolePrivileges"
+        lazy="true"
+        inverse="true"
+		cascade="delete-orphan"
+    >
+        <meta attribute="field-description">
+           @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"
+        </meta>
+        <key>
+            <column name="role_id" />
+        </key>
+        <one-to-many 
+            class="org.lamsfoundation.lams.usermanagement.RolePrivilege"
+        />
+    </set>
+
 </class>
 </hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/RolePrivilege.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/RolePrivilege.hbm.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/RolePrivilege.hbm.xml	31 May 2006 05:23:57 -0000	1.1
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
+    
+<hibernate-mapping>
+<!-- 
+    Created by the Middlegen Hibernate plugin 2.1
+
+    http://boss.bekk.no/boss/middlegen/
+    http://www.hibernate.org/
+-->
+
+<class 
+    name="org.lamsfoundation.lams.usermanagement.RolePrivilege" 
+    table="lams_role_privilege"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_role_privilege"
+    </meta>
+
+    <id
+        name="rpId"
+        type="java.lang.Long"
+        column="rp_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="native"
+            type="java.lang.Long"
+            column="rp_id"
+
+
+        </meta>
+        <generator class="native" />
+    </id>
+
+
+    <!-- Associations -->
+  
+    <!-- bi-directional many-to-one association to Privilege -->
+    <many-to-one
+        name="privilege"
+        class="org.lamsfoundation.lams.usermanagement.Privilege"
+        not-null="true"
+    >
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="privilege_id"         
+        </meta>
+        <column name="privilege_id" />
+    </many-to-one>
+    <!-- bi-directional many-to-one association to Role -->
+    <many-to-one
+        name="role"
+        class="org.lamsfoundation.lams.usermanagement.Role"
+        not-null="true"
+    >
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="role_id"         
+        </meta>
+        <column name="role_id" />
+    </many-to-one>
+
+</class>
+</hibernate-mapping>
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Privilege.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/Privilege.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Privilege.java	31 May 2006 05:18:18 -0000	1.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java,v
diff -u -r1.6 -r1.7
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java	3 Apr 2006 23:36:53 -0000	1.6
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java	31 May 2006 05:18:18 -0000	1.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/RolePrivilege.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/RolePrivilege.java	31 May 2006 05:18:18 -0000	1.1
@@ -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();
+    }
+
+}