Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/OrganisationType.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/OrganisationType.java,v diff -u -r1.5 -r1.6 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/OrganisationType.java 11 May 2006 06:58:37 -0000 1.5 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/OrganisationType.java 7 Jun 2006 02:48:18 -0000 1.6 @@ -36,6 +36,10 @@ */ public class OrganisationType implements Serializable { + public static final Integer ROOT_TYPE = 1; + public static final Integer COURSE_TYPE = 2; + public static final Integer CLASS_TYPE = 3; + public static final String ROOT_DESCRIPTION = "ROOT ORGANISATION"; public static final String COURSE_DESCRIPTION = "COURSE ORGANISATION"; public static final String CLASS_DESCRIPTION = "CLASS ORGANISATION"; 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.8 -r1.9 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java 6 Jun 2006 07:02:59 -0000 1.8 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java 7 Jun 2006 02:48:18 -0000 1.9 @@ -37,8 +37,6 @@ */ public class Role implements Serializable { - public static final String ADMIN = "ADMIN"; - public static final String LEARNER = "LEARNER"; public static final String STAFF = "STAFF";