Index: lams_common/build.xml =================================================================== diff -u -rf964c1062c52d93be83ace1aa252b45deff63d5e -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/build.xml (.../build.xml) (revision f964c1062c52d93be83ace1aa252b45deff63d5e) +++ lams_common/build.xml (.../build.xml) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -11,20 +11,31 @@ + - - + + + + + + + + + + + + Fisheye: Tag ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivity.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserLesson.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerLessonMap.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/ActivityEvaluation.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Competence.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/CompetenceMapping.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/notebook/model/NotebookEntry.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/openid/OpenIDConfig.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerActivityMetadata.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerNodeRole.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolImportSupport.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtCourseClassMap.java =================================================================== diff -u -r572436e008d381df81e6826cefaa3f4ef4e04c7b -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/integration/ExtCourseClassMap.java (.../ExtCourseClassMap.java) (revision 572436e008d381df81e6826cefaa3f4ef4e04c7b) +++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtCourseClassMap.java (.../ExtCourseClassMap.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -4,17 +4,11 @@ import org.apache.commons.lang.builder.ToStringBuilder; import org.lamsfoundation.lams.usermanagement.Organisation; - -/** - * @hibernate.class - * table="lams_ext_course_class_map" - * -*/ public class ExtCourseClassMap implements Serializable { - private static final long serialVersionUID = -6179393464356966543L; + private static final long serialVersionUID = -6179393464356966543L; - /** identifier field */ + /** identifier field */ private Integer sid; /** persistent field */ @@ -28,79 +22,49 @@ /** full constructor */ public ExtCourseClassMap(String courseid, ExtServerOrgMap extServerOrgMap, Organisation organisation) { - this.courseid = courseid; - this.extServerOrgMap = extServerOrgMap; - this.organisation = organisation; + this.courseid = courseid; + this.extServerOrgMap = extServerOrgMap; + this.organisation = organisation; } /** default constructor */ public ExtCourseClassMap() { } - /** - * @hibernate.id - * generator-class="native" - * type="java.lang.Integer" - * column="sid" - * - */ public Integer getSid() { - return this.sid; + return this.sid; } public void setSid(Integer sid) { - this.sid = sid; + this.sid = sid; } - /** - * @hibernate.property - * column="courseid" - * length="255" - * not-null="true" - * - */ public String getCourseid() { - return this.courseid; + return this.courseid; } public void setCourseid(String courseid) { - this.courseid = courseid; + this.courseid = courseid; } - /** - * @hibernate.many-to-one - * not-null="true" - * @hibernate.column name="ext_server_org_map_id" - * - */ public ExtServerOrgMap getExtServerOrgMap() { - return this.extServerOrgMap; + return this.extServerOrgMap; } public void setExtServerOrgMap(ExtServerOrgMap extServerOrgMap) { - this.extServerOrgMap = extServerOrgMap; + this.extServerOrgMap = extServerOrgMap; } - /** - * @hibernate.many-to-one - * not-null="true" - * @hibernate.column name="classid" - * lazy="true" - * - */ public Organisation getOrganisation() { - return this.organisation; + return this.organisation; } public void setOrganisation(Organisation organisation) { - this.organisation = organisation; + this.organisation = organisation; } public String toString() { - return new ToStringBuilder(this) - .append("sid", getSid()) - .append("courseid", getCourseid()) - .toString(); + return new ToStringBuilder(this).append("sid", getSid()).append("courseid", getCourseid()).toString(); } } Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerOrgMap.java =================================================================== diff -u -rd5a281b774f24a41894aac08200627f18e2b25e2 -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerOrgMap.java (.../ExtServerOrgMap.java) (revision d5a281b774f24a41894aac08200627f18e2b25e2) +++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerOrgMap.java (.../ExtServerOrgMap.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -5,10 +5,6 @@ import org.apache.commons.lang.builder.ToStringBuilder; import org.lamsfoundation.lams.usermanagement.Organisation; -/** - * @hibernate.class table="lams_ext_server_org_map" - * - */ public class ExtServerOrgMap implements Serializable, Comparable { private static final long serialVersionUID = 337894825609071182L; @@ -93,11 +89,6 @@ this.extUserUseridMaps = extUserUseridMaps; } - /** - * @hibernate.id generator-class="native" type="java.lang.Integer" - * column="sid" - * - */ public Integer getSid() { return this.sid; } @@ -106,11 +97,6 @@ this.sid = sid; } - /** - * @hibernate.property column="serverid" unique="true" length="255" - * not-null="true" - * - */ public String getServerid() { return this.serverid; } @@ -119,10 +105,6 @@ this.serverid = serverid; } - /** - * @hibernate.property column="serverkey" length="65535" not-null="true" - * - */ public String getServerkey() { return this.serverkey; } @@ -131,10 +113,6 @@ this.serverkey = serverkey; } - /** - * @hibernate.property column="servername" length="255" not-null="true" - * - */ public String getServername() { return this.servername; } @@ -143,10 +121,6 @@ this.servername = servername; } - /** - * @hibernate.property column="serverdesc" length="65535" - * - */ public String getServerdesc() { return this.serverdesc; } @@ -155,11 +129,6 @@ this.serverdesc = serverdesc; } - /** - * @hibernate.property column="prefix" unique="true" length="11" - * not-null="true" - * - */ public String getPrefix() { return this.prefix; } @@ -168,22 +137,14 @@ this.prefix = prefix; } - /** - * @hibernate.property column="userinfo_url" length="65535" not-null="true" - * - */ public String getUserinfoUrl() { return this.userinfoUrl; } public void setUserinfoUrl(String userinfoUrl) { this.userinfoUrl = userinfoUrl; } - - /** - * @hibernate.property column="server_url" length="255" not-null="false" - * - */ + public String getServerUrl() { return this.serverUrl; } @@ -192,22 +153,14 @@ this.serverUrl = serverUrl; } - /** - * @hibernate.property column="timeout_url" length="65535" not-null="true" - * - */ public String getTimeoutUrl() { return this.timeoutUrl; } public void setTimeoutUrl(String timeoutUrl) { this.timeoutUrl = timeoutUrl; } - - /** - * @hibernate.property column="lesson_finish_url" length="65535" not-null="false" - * - */ + public String getLessonFinishUrl() { return this.lessonFinishUrl; } @@ -216,10 +169,6 @@ this.lessonFinishUrl = lessonFinishUrl; } - /** - * @hibernate.property column="disabled" length="1" not-null="true" - * - */ public Boolean getDisabled() { return this.disabled; } @@ -228,11 +177,6 @@ this.disabled = disabled; } - /** - * @hibernate.many-to-one not-null="true" - * @hibernate.column name="orgid" lazy="true" - * - */ public Organisation getOrganisation() { return this.organisation; } @@ -241,12 +185,6 @@ this.organisation = organisation; } - /** - * @hibernate.set lazy="true" inverse="true" cascade="none" - * @hibernate.collection-key column="ext_server_org_map_id" - * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.integration.ExtCourseClassMap" - * - */ public Set getExtCourseClassMaps() { return this.extCourseClassMaps; } @@ -255,12 +193,6 @@ this.extCourseClassMaps = extCourseClassMaps; } - /** - * @hibernate.set lazy="true" inverse="true" cascade="none" - * @hibernate.collection-key column="ext_server_org_map_id" - * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.integration.ExtUserUseridMap" - * - */ public Set getExtUserUseridMaps() { return this.extUserUseridMaps; } Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.java =================================================================== diff -u -r2f21856ec2ab85b47c93cfcc3fa2c8769be65077 -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.java (.../ExtServerToolAdapterMap.java) (revision 2f21856ec2ab85b47c93cfcc3fa2c8769be65077) +++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.java (.../ExtServerToolAdapterMap.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -44,10 +44,6 @@ this.extServer = extServer; } - public Tool getTool() { - return tool; - } - /** * @hibernate.id generator-class="native" type="java.lang.Long" column="uid" * @@ -65,6 +61,9 @@ * @hibernate.column name="tool_id" * */ + public Tool getTool() { + return tool; + } public void setTool(Tool tool) { this.tool = tool; } Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java =================================================================== diff -u -r572436e008d381df81e6826cefaa3f4ef4e04c7b -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java (.../ExtUserUseridMap.java) (revision 572436e008d381df81e6826cefaa3f4ef4e04c7b) +++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java (.../ExtUserUseridMap.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -4,17 +4,14 @@ import org.apache.commons.lang.builder.ToStringBuilder; import org.lamsfoundation.lams.usermanagement.User; - -/** - * @hibernate.class - * table="lams_ext_user_userid_map" - * -*/ +/** + * @hibernate.class table="lams_ext_user_userid_map" + */ public class ExtUserUseridMap implements Serializable { - private static final long serialVersionUID = 1755818193730728064L; + private static final long serialVersionUID = 1755818193730728064L; - /** identifier field */ + /** identifier field */ private Integer sid; /** persistent field */ @@ -28,79 +25,67 @@ /** full constructor */ public ExtUserUseridMap(String extUsername, User user, ExtServerOrgMap extServerOrgMap) { - this.extUsername = extUsername; - this.user = user; - this.extServerOrgMap = extServerOrgMap; + this.extUsername = extUsername; + this.user = user; + this.extServerOrgMap = extServerOrgMap; } /** default constructor */ public ExtUserUseridMap() { } - /** - * @hibernate.id - * generator-class="native" - * type="java.lang.Integer" - * column="sid" - * + /** + * @hibernate.id generator-class="native" type="java.lang.Integer" column="sid" + * */ public Integer getSid() { - return this.sid; + return this.sid; } public void setSid(Integer sid) { - this.sid = sid; + this.sid = sid; } - /** - * @hibernate.property - * column="external_username" - * length="250" - * not-null="true" - * + /** + * @hibernate.property column="external_username" length="250" not-null="true" + * */ public String getExtUsername() { - return this.extUsername; + return this.extUsername; } public void setExtUsername(String extUsername) { - this.extUsername = extUsername; + this.extUsername = extUsername; } - /** - * @hibernate.many-to-one - * not-null="true" - * @hibernate.column name="user_id" - * lazy="true" - * + /** + * @hibernate.many-to-one not-null="true" + * @hibernate.column name="user_id" lazy="true" + * */ public User getUser() { - return this.user; + return this.user; } public void setUser(User user) { - this.user = user; + this.user = user; } - /** - * @hibernate.many-to-one - * not-null="true" - * @hibernate.column name="ext_server_org_map_id" - * + /** + * @hibernate.many-to-one not-null="true" + * @hibernate.column name="ext_server_org_map_id" + * */ public ExtServerOrgMap getExtServerOrgMap() { - return this.extServerOrgMap; + return this.extServerOrgMap; } public void setExtServerOrgMap(ExtServerOrgMap extServerOrgMap) { - this.extServerOrgMap = extServerOrgMap; + this.extServerOrgMap = extServerOrgMap; } public String toString() { - return new ToStringBuilder(this) - .append("sid", getSid()) - .append("extUsername", getExtUsername()) - .toString(); + return new ToStringBuilder(this).append("sid", getSid()).append("extUsername", getExtUsername()).toString(); } } Index: lams_common/src/java/org/lamsfoundation/lams/integration/UserInfoFetchException.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/integration/UserInfoFetchException.java (.../UserInfoFetchException.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_common/src/java/org/lamsfoundation/lams/integration/UserInfoFetchException.java (.../UserInfoFetchException.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -27,35 +27,35 @@ *

* View Source *

- * + * * @author Fei Yang */ @SuppressWarnings("serial") public class UserInfoFetchException extends Exception { - public UserInfoFetchException() { - } + public UserInfoFetchException() { + } - /** - * @param message - */ - public UserInfoFetchException(String message) { - super(message); - } + /** + * @param message + */ + public UserInfoFetchException(String message) { + super(message); + } - /** - * @param cause - */ - public UserInfoFetchException(Throwable cause) { - super(cause); - } + /** + * @param cause + */ + public UserInfoFetchException(Throwable cause) { + super(cause); + } - /** - * @param message - * @param cause - */ - public UserInfoFetchException(String message, Throwable cause) { - super(message, cause); - } + /** + * @param message + * @param cause + */ + public UserInfoFetchException(String message, Throwable cause) { + super(message, cause); + } } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java =================================================================== diff -u -r8e0af661d84b765d167c4b982f2f1f7d3c34e78f -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision 8e0af661d84b765d167c4b982f2f1f7d3c34e78f) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -48,8 +48,6 @@ /** * Base class for all activities. If you add another subclass, you must update * ActivityDAO.getActivityByActivityId() and add a ACTIVITY_TYPE constant. - * - * @hibernate.class table="lams_learning_activity" */ public abstract class Activity implements Serializable, Nullable, Comparable { @@ -394,10 +392,6 @@ // --------------------------------------------------------------------- // Getters and Setters // --------------------------------------------------------------------- - /** - * @hibernate.activityUIID generator-class="native" type="java.lang.Long" - * column="activity_id" - */ public Long getActivityId() { return activityId; } @@ -406,9 +400,6 @@ this.activityId = activityId; } - /** - * @hibernate.property column="activityUIID" length="11" - */ public Integer getActivityUIID() { return activityUIID; } @@ -417,9 +408,6 @@ activityUIID = id; } - /** - * @hibernate.property column="description" length="65535" - */ public String getDescription() { return description; } @@ -428,9 +416,6 @@ this.description = description; } - /** - * @hibernate.property column="title" length="255" - */ public String getTitle() { return title; } @@ -439,9 +424,6 @@ this.title = title; } - /** - * @hibernate.property column="xcoord" length="11" - */ public Integer getXcoord() { return xcoord; } @@ -450,9 +432,6 @@ this.xcoord = xcoord; } - /** - * @hibernate.property column="ycoord" length="11" - */ public Integer getYcoord() { return ycoord; } @@ -461,9 +440,6 @@ this.ycoord = ycoord; } - /** - * @hibernate.property column="order_id" length="11" - */ public Integer getOrderId() { return orderId; } @@ -472,9 +448,6 @@ this.orderId = orderId; } - /** - * @hibernate.property column="define_later_flag" length="4" not-null="true" - */ public Boolean getDefineLater() { return defineLater; } @@ -483,9 +456,6 @@ this.defineLater = defineLater; } - /** - * @hibernate.property column="create_date_time" length="19" not-null="true" - */ public Date getCreateDateTime() { return createDateTime; } @@ -495,11 +465,6 @@ this.createDateTime = createDateTime != null ? createDateTime : new Date(); } - /** - * @hibernate.many-to-one not-null="true" - * @hibernate.column name="learning_library_id" - * - */ public org.lamsfoundation.lams.learningdesign.LearningLibrary getLearningLibrary() { return learningLibrary; } @@ -508,11 +473,6 @@ this.learningLibrary = learningLibrary; } - /** - * @hibernate.many-to-one not-null="true" - * @hibernate.column name="parent_activity_id" - * - */ public org.lamsfoundation.lams.learningdesign.Activity getParentActivity() { return parentActivity; } @@ -521,24 +481,14 @@ this.parentActivity = parentActivity; } - /** - * @hibernate.many-to-one not-null="true" - * @hibernate.column name="learning_design_id" - * - */ - public org.lamsfoundation.lams.learningdesign.LearningDesign getLearningDesign() { + public org.lamsfoundation.lams.learningdesign.LearningDesign getLearningDesign() { return learningDesign; } public void setLearningDesign(org.lamsfoundation.lams.learningdesign.LearningDesign learningDesign) { this.learningDesign = learningDesign; } - /** - * @hibernate.many-to-one not-null="true" - * @hibernate.column name="grouping_id" - * - */ public org.lamsfoundation.lams.learningdesign.Grouping getGrouping() { return grouping; } @@ -547,11 +497,6 @@ this.grouping = grouping; } - /** - * @hibernate.many-to-one not-null="true" - * @hibernate.column name="learning_activity_type_id" - * - */ public Integer getActivityTypeId() { return activityTypeId; } @@ -693,7 +638,6 @@ } /** - * @hibernate.property column="library_activity_ui_image" length="255" * @return Returns the libraryActivityUiImage. */ public String getLibraryActivityUiImage() { Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.java =================================================================== diff -u -r8386a3fecd9c7baf6ed69d499016dedd8a83eac6 -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.java (.../BranchActivityEntry.java) (revision 8386a3fecd9c7baf6ed69d499016dedd8a83eac6) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.java (.../BranchActivityEntry.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -41,8 +41,6 @@ * * @author Fiona Malikoff * @version 2.1 - * - * @hibernate.class table="lams_branch_activity_entry" */ public class BranchActivityEntry { @@ -97,10 +95,6 @@ this.condition = condition; } - /** - * @hibernate.id generator-class="native" type="java.lang.Long" column="entry_id" - * - */ public Long getEntryId() { return entryId; } @@ -109,9 +103,6 @@ entryId = id; } - /** - * @hibernate.property column="entry_ui_id" length="11" - */ public Integer getEntryUIID() { return entryUIID; } @@ -120,11 +111,6 @@ this.entryUIID = entryUIID; } - /** - * @hibernate.many-to-one not-null="true" - * @hibernate.column name="sequence_activity_id" - * - */ public org.lamsfoundation.lams.learningdesign.SequenceActivity getBranchSequenceActivity() { return branchSequenceActivity; } @@ -133,11 +119,6 @@ this.branchSequenceActivity = branchSequenceActivity; } - /** - * @hibernate.many-to-one not-null="true" - * @hibernate.column name="branch_activity_id" - * - */ public org.lamsfoundation.lams.learningdesign.Activity getBranchingActivity() { return branchingActivity; } @@ -146,11 +127,6 @@ this.branchingActivity = branchingActivity; } - /** - * @hibernate.many-to-one not-null="true" - * @hibernate.column name="group_id" - * - */ public org.lamsfoundation.lams.learningdesign.Group getGroup() { return group; } @@ -159,13 +135,6 @@ this.group = group; } - /** - * Used for tool output based branching only - * - * @hibernate.many-to-one not-null="true" cascade="all-delete-orphan" - * @hibernate.column name="condition_id" - * - */ public BranchCondition getCondition() { return condition; } @@ -237,10 +206,6 @@ .toString(); } - /** - * @hibernate.property column="open_gate" - * @return - */ public Boolean getGateOpenWhenConditionMet() { return gateOpenWhenConditionMet; } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java =================================================================== diff -u -r8386a3fecd9c7baf6ed69d499016dedd8a83eac6 -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java (.../BranchCondition.java) (revision 8386a3fecd9c7baf6ed69d499016dedd8a83eac6) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java (.../BranchCondition.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -88,10 +88,6 @@ conditionDTO.getEndValue(), conditionDTO.getExactMatchValue()); } - /** - * @hibernate.id generator-class="native" type="java.lang.Long" column="condition_id" - * - */ public Long getConditionId() { return conditionId; } @@ -100,10 +96,6 @@ this.conditionId = conditionId; } - /** - * @hibernate.property column="condition_ui_id" length="11" - * - */ public Integer getConditionUIID() { return conditionUIID; } @@ -112,9 +104,6 @@ this.conditionUIID = conditionUIID; } - /** - * @hibernate.property column="order_id" length="11" - */ public Integer getOrderId() { return orderId; } @@ -123,9 +112,6 @@ this.orderId = orderId; } - /** - * @hibernate.property column="name" length="255" - */ public String getName() { return name; } @@ -134,11 +120,6 @@ this.name = name; } - /** - * The display name is a name shown to the user so they can link a condition to a branch. - * - * @hibernate.property column="display_name" length="255" - */ public String getDisplayName() { return displayName; } @@ -147,9 +128,6 @@ this.displayName = displayName; } - /** - * @hibernate.property column="type" length="255" - */ public String getType() { return type; } @@ -158,9 +136,6 @@ this.type = type; } - /** - * @hibernate.property column="start_value" length="255" - */ public String getStartValue() { return startValue; } @@ -169,9 +144,6 @@ this.startValue = startValue; } - /** - * @hibernate.property column="end_value" length="255" - */ public String getEndValue() { return endValue; } @@ -180,9 +152,6 @@ this.endValue = endValue; } - /** - * @hibernate.property column="exact_match_value" length="255" - */ public String getExactMatchValue() { return exactMatchValue; } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java =================================================================== diff -u -r01349ae55aa04376236920a2314eda93d93d5f6d -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java (.../Group.java) (revision 01349ae55aa04376236920a2314eda93d93d5f6d) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java (.../Group.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -36,12 +36,6 @@ import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.util.Nullable; - -/** - * @hibernate.class - * table="lams_group" - * -*/ public class Group implements Serializable,Nullable,Comparable { public final static int STAFF_GROUP_ORDER_ID = 1; @@ -146,22 +140,10 @@ // Field Access Methods //--------------------------------------------------------------------- - /** - * @hibernate.id - * generator-class="native" - * type="java.lang.Long" - * column="group_id" - * - */ public Long getGroupId() { return this.groupId; } - /** - * @hibernate.property - * column="group_name" - * - * @return - */ + public String getGroupName() { return groupName; } @@ -174,13 +156,6 @@ this.groupId = groupId; } - /** - * @hibernate.property - * column="order_id" - * length="6" - * not-null="true" - * - */ public int getOrderId() { return this.orderId; } @@ -189,9 +164,6 @@ this.orderId = orderId; } - /** - * @hibernate.property column="group_ui_id" length="11" - */ public Integer getGroupUIID() { return this.groupUIID; } @@ -200,12 +172,6 @@ this.groupUIID = uiId; } - /** - * @hibernate.many-to-one - * not-null="true" - * @hibernate.column name="grouping_id" - * - */ public org.lamsfoundation.lams.learningdesign.Grouping getGrouping() { return this.grouping; } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java =================================================================== diff -u -rc209be8131f22f6fe37bd8d6c14b56425a78b766 -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java (.../Grouping.java) (revision c209be8131f22f6fe37bd8d6c14b56425a78b766) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java (.../Grouping.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -39,9 +39,6 @@ import org.lamsfoundation.lams.usermanagement.User; /** - * - * @hibernate.class table="lams_grouping" - * * @author Jacky Fang */ public abstract class Grouping implements Serializable { Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java =================================================================== diff -u -r097c7143c4edf7a649e785d0f58a1bbf640edd3b -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java (.../LearningDesign.java) (revision 097c7143c4edf7a649e785d0f58a1bbf640edd3b) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java (.../LearningDesign.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -43,8 +43,6 @@ /** * @author Manpreet Minhas - * @hibernate.class table="lams_learning_design" - * */ public class LearningDesign implements Serializable { Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningLibrary.java =================================================================== diff -u -r870373d635bc769aee2dc271e6ff12818fcfcea6 -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningLibrary.java (.../LearningLibrary.java) (revision 870373d635bc769aee2dc271e6ff12818fcfcea6) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningLibrary.java (.../LearningLibrary.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -36,9 +36,6 @@ /** * @author Manpreet Minhas - * @hibernate.class - * table="lams_learning_library" - * */ public class LearningLibrary implements Serializable { @@ -88,13 +85,6 @@ this.activities = activities; } - /** - * @hibernate.id - * generator-class="native" - * type="java.lang.Long" - * column="learning_library_id" - * - */ public Long getLearningLibraryId() { return this.learningLibraryId; } @@ -103,12 +93,6 @@ this.learningLibraryId = learningLibraryId; } - /** - * @hibernate.property - * column="description" - * length="65535" - * - */ public String getDescription() { return this.description; } @@ -117,12 +101,6 @@ this.description = description; } - /** - * @hibernate.property - * column="title" - * length="255" - * - */ public String getTitle() { return this.title; } @@ -131,13 +109,6 @@ this.title = title; } - /** - * @hibernate.property - * column="create_date_time" - * length="19" - * not-null="true" - * - */ public Date getCreateDateTime() { return this.createDateTime; } @@ -146,17 +117,6 @@ this.createDateTime = createDateTime != null ? createDateTime : new Date(); } - /** - * @hibernate.set - * lazy="false" - * inverse="true" - * cascade="none" - * @hibernate.collection-key - * column="learning_library_id" - * @hibernate.collection-one-to-many - * class="org.lamsfoundation.lams.learningdesign.Activity" - * - */ public Set getActivities() { return this.activities; } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java =================================================================== diff -u -r61e7bbf20d65e2ecb5e50f3154e52264003defa1 -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java (.../Transition.java) (revision 61e7bbf20d65e2ecb5e50f3154e52264003defa1) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java (.../Transition.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -33,8 +33,6 @@ /** * @author Manpreet Minhas - * @hibernate.class table="lams_learning_transition" - * */ public class Transition implements Serializable { // LAMS 2.4 introduced different transition types; "classical" one is progress type; now we also have data flow; see @@ -140,10 +138,6 @@ return newTransition; } - /** - * @hibernate.transitionUIID generator-class="native" type="java.lang.Long" column="transition_id" - * - */ public Long getTransitionId() { return transitionId; } @@ -152,10 +146,6 @@ this.transitionId = transitionId; } - /** - * @hibernate.property column="transitionUIID" length="11" - * - */ public Integer getTransitionUIID() { return transitionUIID; } @@ -164,10 +154,6 @@ transitionUIID = id; } - /** - * @hibernate.property column="description" length="65535" - * - */ public String getDescription() { return description; } @@ -176,10 +162,6 @@ this.description = description; } - /** - * @hibernate.property column="title" length="255" - * - */ public String getTitle() { return title; } @@ -188,10 +170,6 @@ this.title = title; } - /** - * @hibernate.property column="create_date_time" length="19" not-null="true" - * - */ public Date getCreateDateTime() { return createDateTime; } @@ -200,11 +178,6 @@ this.createDateTime = createDateTime != null ? createDateTime : new Date(); } - /** - * @hibernate.many-to-one not-null="true" - * @hibernate.column name="to_activity_id" - * - */ public org.lamsfoundation.lams.learningdesign.Activity getToActivity() { return toActivity; } @@ -213,11 +186,6 @@ this.toActivity = toActivity; } - /** - * @hibernate.many-to-one not-null="true" - * @hibernate.column name="from_activity_id" - * - */ public org.lamsfoundation.lams.learningdesign.Activity getFromActivity() { return fromActivity; } @@ -226,11 +194,6 @@ this.fromActivity = fromActivity; } - /** - * @hibernate.many-to-one not-null="true" - * @hibernate.column name="learning_design_id" - * - */ public org.lamsfoundation.lams.learningdesign.LearningDesign getLearningDesign() { return learningDesign; } @@ -289,11 +252,6 @@ return transitionType.equals(Transition.PROGRESS_TRANSITION_TYPE); } - /** - * @hibernate.many-to-one not-null="true" - * @hibernate.column name="transition_type" - * - */ public Integer getTransitionType() { return transitionType; } Index: lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java =================================================================== diff -u -r27a9e58b46446d891cf6b081e8fb6fb6f6294e2e -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java (.../Lesson.java) (revision 27a9e58b46446d891cf6b081e8fb6fb6f6294e2e) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java (.../Lesson.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -267,9 +267,6 @@ // --------------------------------------------------------------------- // Getters and Setters // --------------------------------------------------------------------- - /** - * @hibernate.id generator-class="native" type="java.lang.Long" column="lesson_id" - */ public Long getLessonId() { return this.lessonId; } @@ -280,8 +277,6 @@ /** * Hibernate version column - updated automatically - * - * @hibernate.version type="java.lang.Integer" column="version" */ public Integer getVersion() { return this.version; @@ -292,7 +287,6 @@ } /** - * @hibernate.property column="name" length="255" not-null="true" * @return Returns the lessonName. */ public String getLessonName() { @@ -308,7 +302,6 @@ } /** - * @hibernate.property column="description" length="65535" * @return Returns the lessonDescription. */ public String getLessonDescription() { @@ -323,9 +316,6 @@ this.lessonDescription = lessonDescription; } - /** - * @hibernate.property type="java.sql.Timestamp" column="create_date_time" length="19" - */ public Date getCreateDateTime() { return this.createDateTime; } @@ -334,9 +324,6 @@ this.createDateTime = createDateTime; } - /** - * @hibernate.property type="java.sql.Timestamp" column="start_date_time" length="19" - */ public Date getStartDateTime() { return this.startDateTime; } @@ -345,9 +332,6 @@ this.startDateTime = startDateTime; } - /** - * @hibernate.property type="java.sql.Timestamp" column="end_date_time" length="19" - */ public Date getEndDateTime() { return this.endDateTime; } @@ -357,8 +341,6 @@ } /** - * @hibernate.property type="java.sql.Timestamp" column="schedule_end_date_time" length="19" - * * @return Returns the scheduleEndDate. */ public Date getScheduleEndDate() { @@ -381,8 +363,6 @@ } /** - * @hibernate.property type="java.lang.Integer" column="scheduled_number_days_to_lesson_finish" length="3" - * * @return Returns the number of days the lesson will be available to user since he starts it. (It's ON only if the * lesson was scheduled to be finished and individual option was selected) */ @@ -400,7 +380,6 @@ } /** - * @hibernate.property type="java.sql.Timestamp" column="schedule_start_date_time" length="19" * @return Returns the scheduleStartDate. */ public Date getScheduleStartDate() { @@ -415,10 +394,6 @@ this.scheduleStartDate = scheduleStartDate; } - /** - * @hibernate.many-to-one not-null="true" - * @hibernate.column name="user_id" - */ public User getUser() { return this.user; } @@ -427,9 +402,6 @@ this.user = user; } - /** - * @hibernate.property type="java.lang.Integer" column="lesson_state_id" length="3" - */ public Integer getLessonStateId() { return this.lessonStateId; } @@ -438,9 +410,6 @@ this.lessonStateId = lessonStateId; } - /** - * @hibernate.property type="java.lang.Integer" column="previous_state_id" length="3" - */ public Integer getPreviousLessonStateId() { return this.previousLessonStateId; } @@ -449,9 +418,6 @@ this.previousLessonStateId = previousLessonStateId; } - /** - * @hibernate.property type="java.lang.Boolean" column="enable_lesson_intro" length="1" - */ public Boolean isEnableLessonIntro() { return enableLessonIntro; } @@ -460,9 +426,6 @@ this.enableLessonIntro = enableLessonIntro; } - /** - * @hibernate.property type="java.lang.Boolean" column="display_design_image" length="1" - */ public Boolean isDisplayDesignImage() { return displayDesignImage; } @@ -471,9 +434,6 @@ this.displayDesignImage = displayDesignImage; } - /** - * @hibernate.property type="java.lang.Boolean" column="learner_exportport_avail" length="1" - */ public Boolean getLearnerExportAvailable() { return learnerExportAvailable; } @@ -482,9 +442,6 @@ this.learnerExportAvailable = learnerExportAvailable; } - /** - * @hibernate.property type="java.lang.Boolean" column="learner_presence_avail" length="1" - */ public Boolean getLearnerPresenceAvailable() { return learnerPresenceAvailable; } @@ -493,9 +450,6 @@ this.learnerPresenceAvailable = learnerPresenceAvailable; } - /** - * @hibernate.property type="java.lang.Boolean" column="learner_exportport_avail" length="1" - */ public Boolean getLearnerImAvailable() { return learnerImAvailable; } @@ -504,9 +458,6 @@ this.learnerImAvailable = learnerImAvailable; } - /** - * @hibernate.property type="java.lang.Boolean" column="live_edit_enabled" length="1" - */ public Boolean getLiveEditEnabled() { return liveEditEnabled; } @@ -515,9 +466,6 @@ this.liveEditEnabled = liveEditEnabled; } - /** - * @hibernate.property type="java.lang.Boolean" column="enable_lesson_notifications" length="1" - */ public Boolean getEnableLessonNotifications() { return enableLessonNotifications; } @@ -526,9 +474,6 @@ this.enableLessonNotifications = enableLessonNotifications; } - /** - * @hibernate.property type="java.lang.Boolean" column="locked_for_edit" length="1" - */ public Boolean getLockedForEdit() { return lockedForEdit; } @@ -537,10 +482,6 @@ this.lockedForEdit = lockedForEdit; } - /** - * @hibernate.many-to-one not-null="true" cascade="none" - * @hibernate.column name="learning_design_id" - */ public LearningDesign getLearningDesign() { return this.learningDesign; } @@ -549,10 +490,6 @@ this.learningDesign = learningDesign; } - /** - * @hibernate.many-to-one not-null="false" unique="true" cascade = "save-update" - * @hibernate.column name="learning_design_id" - */ public LessonClass getLessonClass() { return this.lessonClass; } @@ -561,10 +498,6 @@ this.lessonClass = lessonClass; } - /** - * @hibernate.many-to-one not-null="false" cascade="none" - * @hibernate.column name="organisation_id" - */ public Organisation getOrganisation() { return this.organisation; } @@ -573,11 +506,6 @@ this.organisation = organisation; } - /** - * @hibernate.set lazy="false" inverse="true" cascade="none" - * @hibernate.collection-key column="lesson_id" - * @@hibernate.collection-one-to-many class="org.lamsfoundation.lams.lesson.LearnerProgress" - */ public Set getLearnerProgresses() { return this.learnerProgresses; } @@ -659,9 +587,6 @@ this.gradebookUserLessons = gradebookUserLessons; } - /** - * @hibernate.property type="java.lang.Boolean" column="marks_released" length="1" - */ public Boolean getMarksReleased() { return marksReleased; } Index: lams_common/src/java/org/lamsfoundation/lams/openid/OpenIDConfig.java =================================================================== diff -u -rab19db088359a46353cc92e806c40ff5cff818b9 -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/openid/OpenIDConfig.java (.../OpenIDConfig.java) (revision ab19db088359a46353cc92e806c40ff5cff818b9) +++ lams_common/src/java/org/lamsfoundation/lams/openid/OpenIDConfig.java (.../OpenIDConfig.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -1,5 +1,8 @@ package org.lamsfoundation.lams.openid; +/** + * @hibernate.class table="lams_openid_config" + */ public class OpenIDConfig { private String configKey; private String configValue; @@ -12,7 +15,7 @@ } /** - * @hibernate.id type="java.lang.Long" column="config_key" + * @hibernate.id column="config_key" length="20" */ public String getConfigKey() { return configKey; Index: lams_common/src/java/org/lamsfoundation/lams/signup/model/SignupOrganisation.java =================================================================== diff -u -r4aa7a60c90a430b0c6a20a46ca8cfccbe302edbf -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/signup/model/SignupOrganisation.java (.../SignupOrganisation.java) (revision 4aa7a60c90a430b0c6a20a46ca8cfccbe302edbf) +++ lams_common/src/java/org/lamsfoundation/lams/signup/model/SignupOrganisation.java (.../SignupOrganisation.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -9,8 +9,6 @@ */ public class SignupOrganisation { - //There is no XDoclet annotations as it can't produce lazy="false" for Organisation - /** * Link on Lams wiki signup help page. */ Index: lams_common/src/java/org/lamsfoundation/lams/themes/Theme.java =================================================================== diff -u -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/themes/Theme.java (.../Theme.java) (revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a) +++ lams_common/src/java/org/lamsfoundation/lams/themes/Theme.java (.../Theme.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -26,15 +26,13 @@ /** * @author lfoxton * - * Model for theme whether it be flash, css or other - * - * @hibernate.class table="lams_theme" + * Model for theme whether it be flash, css or other */ public class Theme { public static final int TYPE_CSS = 1; public static final int TYPE_FLASH = 2; - + /** identifier field */ private Long themeId; @@ -43,93 +41,76 @@ /** nullable persistent field */ private String description; - + /** persistent field */ private String imageDirectory; - + /** persistent field */ private Integer type; - + /** non-persistent field */ private Boolean currentDefaultTheme; - + /** non-persistent field */ private Boolean notEditable; /** default constructor */ public Theme() { } - /** - * @hibernate.id generator-class="assigned" type="java.lang.Long" column="theme_id" - */ public Long getThemeId() { - return themeId; + return themeId; } public void setThemeId(Long themeId) { - this.themeId = themeId; + this.themeId = themeId; } - /** - * @hibernate.property column="name" length="100" not-null="true" - */ public String getName() { - return this.name; + return this.name; } - public void setName(String name) { - this.name = name; + this.name = name; } - /** - * @hibernate.property column="description" length="100" - * - */ public String getDescription() { - return this.description; + return this.description; } public void setDescription(String description) { - this.description = description; + this.description = description; } - /** - * @hibernate.property column="image_directory" length="100" - */ public String getImageDirectory() { - return this.imageDirectory; + return this.imageDirectory; } public void setImageDirectory(String imageDirectory) { - this.imageDirectory = imageDirectory; + this.imageDirectory = imageDirectory; } - /** - * @hibernate.property column="theme_type" length="11" - */ public Integer getType() { - return type; + return type; } public void setType(Integer type) { - this.type = type; + this.type = type; } public Boolean getCurrentDefaultTheme() { - return currentDefaultTheme; + return currentDefaultTheme; } public void setCurrentDefaultTheme(Boolean currentDefaultTheme) { - this.currentDefaultTheme = currentDefaultTheme; + this.currentDefaultTheme = currentDefaultTheme; } public Boolean getNotEditable() { - return notEditable; + return notEditable; } public void setNotEditable(Boolean notEditable) { - this.notEditable = notEditable; + this.notEditable = notEditable; } } Index: lams_common/src/java/org/lamsfoundation/lams/tool/SystemTool.java =================================================================== diff -u -rd3b9b5d94b98da06dcce673877406d8e580a114e -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/tool/SystemTool.java (.../SystemTool.java) (revision d3b9b5d94b98da06dcce673877406d8e580a114e) +++ lams_common/src/java/org/lamsfoundation/lams/tool/SystemTool.java (.../SystemTool.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -33,8 +33,6 @@ /** * Represents the URLs for the internal functionality such as grouping and gates. Eventually these will become * "pluggable" tools, so that we can have other types of grouping/gates, without making changes to the core. - * - * @hibernate.class table="lams_system_tool" */ public class SystemTool implements Serializable { @@ -127,9 +125,6 @@ public SystemTool() { } - /** - * @hibernate.id generator-class="native" type="java.lang.Long" column="system_tool_id" - */ public Long getSystemToolId() { return systemToolId; } @@ -138,9 +133,6 @@ this.systemToolId = systemToolId; } - /** - * @hibernate.property column="learning_activity_type_id" type="java.lang.Integer" not-null="true" - */ public Integer getActivityTypeId() { return activityTypeId; } @@ -149,9 +141,6 @@ this.activityTypeId = activityTypeId; } - /** - * @hibernate.property column="tool_display_name" length="255" not-null="true" - */ public String getToolDisplayName() { return toolDisplayName; } @@ -160,9 +149,6 @@ this.toolDisplayName = toolDisplayName; } - /** - * @hibernate.property column="description" length="65535" - */ public String getDescription() { return description; } @@ -171,9 +157,6 @@ this.description = description; } - /** - * @hibernate.property column="learner_url" length="65535" not-null="true" - */ public String getLearnerUrl() { return learnerUrl; } @@ -182,9 +165,6 @@ this.learnerUrl = learnerUrl; } - /** - * @hibernate.property column="learner_preview_url" length="65535" not-null="false" - */ public String getLearnerPreviewUrl() { return learnerPreviewUrl; } @@ -193,9 +173,6 @@ this.learnerPreviewUrl = learnerPreviewUrl; } - /** - * @hibernate.property column="learner_progress_url" length="65535" not-null="false" - */ public String getLearnerProgressUrl() { return learnerProgressUrl; } @@ -204,9 +181,6 @@ this.learnerProgressUrl = learnerProgressUrl; } - /** - * @hibernate.property column="export_pfolio_learner_url" length="65535" not-null="false" - */ public String getExportPortfolioLearnerUrl() { return exportPortfolioLearnerUrl; } @@ -215,9 +189,6 @@ this.exportPortfolioLearnerUrl = exportPortfolioLearnerUrl; } - /** - * @hibernate.property column="export_pfolio_class_url" length="65535" not-null="false" - */ public String getExportPortfolioClassUrl() { return exportPortfolioClassUrl; } @@ -227,7 +198,6 @@ } /** - * @hibernate.property column="admin_url" length="65535" not-null="false" * @return Returns the helpUrl. */ public String getAdminUrl() { @@ -243,7 +213,6 @@ } /** - * @hibernate.property column="create_date_time" length="19" not-null="true" * @return Returns the createDateTime. */ public Date getCreateDateTime() { @@ -267,7 +236,6 @@ } /** - * @hibernate.property column="contribute_url" length="65535" not-null="false" * @return Returns the contributeUrl. */ public String getContributeUrl() { @@ -283,7 +251,6 @@ } /** - * @hibernate.property column="monitor_url" length="65535" not-null="false" * @return Returns the monitorUrl. */ public String getMonitorUrl() { @@ -299,7 +266,6 @@ } /** - * @hibernate.property column="help_url" length="65535" not-null="false" * @return Returns the helpUrl. */ public String getHelpUrl() { @@ -337,9 +303,6 @@ return new HashCodeBuilder().append(getSystemToolId()).toHashCode(); } - /** - * @hibernate.property column="pedagogical_planner_url" length="65535" not-null="false" - */ public String getPedagogicalPlannerUrl() { return pedagogicalPlannerUrl; } Index: lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java =================================================================== diff -u -r2f21856ec2ab85b47c93cfcc3fa2c8769be65077 -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision 2f21856ec2ab85b47c93cfcc3fa2c8769be65077) +++ lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -34,10 +34,6 @@ import org.lamsfoundation.lams.integration.ExtServerToolAdapterMap; import org.lamsfoundation.lams.tool.dto.AuthoringToolDTO; -/** - * - * @hibernate.class table="lams_tool" - */ public class Tool implements Serializable { /** identifier field */ @@ -207,9 +203,6 @@ this.mappedServers = new HashSet(); } - /** - * @hibernate.id generator-class="native" type="java.lang.Long" column="tool_id" - */ public Long getToolId() { return toolId; } @@ -218,9 +211,6 @@ this.toolId = toolId; } - /** - * @hibernate.property column="learner_url" length="65535" not-null="true" - */ public String getLearnerUrl() { return learnerUrl; } @@ -229,9 +219,6 @@ this.learnerUrl = learnerUrl; } - /** - * @hibernate.property column="learner_preview_url" length="65535" not-null="false" - */ public String getLearnerPreviewUrl() { return learnerPreviewUrl; } @@ -240,9 +227,6 @@ this.learnerPreviewUrl = learnerPreviewUrl; } - /** - * @hibernate.property column="learner_progress_url" length="65535" not-null="false" - */ public String getLearnerProgressUrl() { return learnerProgressUrl; } @@ -259,9 +243,6 @@ return contributeURL != null && contributeURL.trim().length() > 0; } - /** - * @hibernate.property column="author_url" length="65535" not-null="true" - */ public String getAuthorUrl() { return authorUrl; } @@ -287,7 +268,6 @@ } /** - * @hibernate.property column="supports_run_offline_flag" length="1" not-null="true" * @return Returns the supportsRunOffline. */ public boolean getSupportsRunOffline() { @@ -302,9 +282,6 @@ this.supportsRunOffline = supportsRunOffline; } - /** - * @hibernate.property column="define_later_url" length="65535" not-null="false" - */ public String getDefineLaterUrl() { return defineLaterUrl; } @@ -313,9 +290,6 @@ this.defineLaterUrl = defineLaterUrl; } - /** - * @hibernate.property column="default_tool_content_id" length="20" not-null="false" - */ public long getDefaultToolContentId() { return defaultToolContentId; } @@ -324,9 +298,6 @@ this.defaultToolContentId = defaultToolContentId; } - /** - * @hibernate.property column="tool_signature" length="64" not-null="true" - */ public String getToolSignature() { return toolSignature; } @@ -335,9 +306,6 @@ this.toolSignature = toolSignature; } - /** - * @hibernate.property column="tool_display_name" length="255" not-null="true" - */ public String getToolDisplayName() { return toolDisplayName; } @@ -346,9 +314,6 @@ this.toolDisplayName = toolDisplayName; } - /** - * @hibernate.property column="description" length="65535" - */ public String getDescription() { return description; } @@ -357,9 +322,6 @@ this.description = description; } - /** - * @hibernate.property column="service_name" length="65535" not-null="true" - */ public String getServiceName() { return serviceName; } @@ -368,9 +330,6 @@ this.serviceName = serviceName; } - /** - * @hibernate.property column="export_pfolio_learner_url" length="65535" not-null="false" - */ public String getExportPortfolioLearnerUrl() { return exportPortfolioLearnerUrl; } @@ -379,9 +338,6 @@ this.exportPortfolioLearnerUrl = exportPortfolioLearnerUrl; } - /** - * @hibernate.property column="export_pfolio_class_url" length="65535" not-null="false" - */ public String getExportPortfolioClassUrl() { return exportPortfolioClassUrl; } @@ -390,12 +346,6 @@ this.exportPortfolioClassUrl = exportPortfolioClassUrl; } - /** - * @hibernate.set lazy="true" inverse="true" cascade="none" - * @hibernate.collection-key column="tool_id" - * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.Activity" - * - */ public Set getActivities() { return activities; } @@ -405,7 +355,6 @@ } /** - * @hibernate.property column="valid_flag" length="1" not-null="true" * @return Returns the valid. */ public boolean isValid() { @@ -436,7 +385,6 @@ } /** - * @hibernate.property column="create_date_time" length="19" not-null="true" * @return Returns the createDateTime. */ public Date getCreateDateTime() { @@ -452,7 +400,6 @@ } /** - * @hibernate.property column="contribute_url" length="65535" not-null="false" * @return Returns the contributeUrl. */ public String getContributeUrl() { @@ -468,7 +415,6 @@ } /** - * @hibernate.property column="moderation_url" length="65535" not-null="false" * @return Returns the moderationUrl. */ public String getModerationUrl() { @@ -484,7 +430,6 @@ } /** - * @hibernate.property column="monitor_url" length="65535" not-null="false" * @return Returns the monitorUrl. */ public String getMonitorUrl() { @@ -500,7 +445,6 @@ } /** - * @hibernate.property column="help_url" length="65535" not-null="false" * @return Returns the helpUrl. */ public String getHelpUrl() { @@ -516,7 +460,6 @@ } /** - * @hibernate.property column="admin_url" length="65535" not-null="false" * @return Returns the helpUrl. */ public String getAdminUrl() { @@ -531,9 +474,6 @@ this.adminUrl = adminUrl; } - /** - * @hibernate.property column="tool_identifier" length="64" - */ public String getToolIdentifier() { return toolIdentifier; } @@ -542,9 +482,6 @@ this.toolIdentifier = toolIdentifier; } - /** - * @hibernate.property column="tool_version" length="10" - */ public String getToolVersion() { return toolVersion; } @@ -553,9 +490,6 @@ this.toolVersion = toolVersion; } - /** - * @hibernate.property column="language_file" length="255" not-null="false" - */ public String getLanguageFile() { return languageFile; } @@ -565,7 +499,6 @@ } /** - * @hibernate.property column="supports_outputs" length="1" * @return Returns the supportsOutputs. */ public boolean getSupportsOutputs() { @@ -580,9 +513,6 @@ this.supportsOutputs = supportsOutputs; } - /** - * @hibernate.property column="ext_lms_id" length="255" not-null="false" - */ public String getExtLmsId() { return extLmsId; } @@ -626,9 +556,6 @@ return vo; } - /** - * @hibernate.property column="pedagogical_planner_url" length="65535" not-null="false" - */ public String getPedagogicalPlannerUrl() { return pedagogicalPlannerUrl; } Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolImportSupport.java =================================================================== diff -u -r920894ca746cba5e080023c5cc80167d64d1653d -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/tool/ToolImportSupport.java (.../ToolImportSupport.java) (revision 920894ca746cba5e080023c5cc80167d64d1653d) +++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolImportSupport.java (.../ToolImportSupport.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -29,19 +29,18 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; - -/** - * When importing data, which "tool signatures" does a tool support. This maps the - * 1.0.2 tool types to 2.0 tool signatures, and may be used for 2.1 tool versions to automatically - * support 2.0 tool data, even if the tools themselves have changed. - * +/** + * When importing data, which "tool signatures" does a tool support. This maps the 1.0.2 tool types to 2.0 tool + * signatures, and may be used for 2.1 tool versions to automatically support 2.0 tool data, even if the tools + * themselves have changed. + * * @hibernate.class table="lams_tool_import_support" */ public class ToolImportSupport implements Serializable { - private static final long serialVersionUID = -6212324577067151495L; + private static final long serialVersionUID = -6212324577067151495L; - /** identifier field */ + /** identifier field */ private Long id; /** persistent field */ @@ -51,82 +50,69 @@ private String supportsToolSignature; /** full constructor */ - public ToolImportSupport(Long id, - String installedToolSignature, - String supportsToolSignature) - { - this.id = id; - this.installedToolSignature = installedToolSignature; - this.supportsToolSignature = supportsToolSignature; + public ToolImportSupport(Long id, String installedToolSignature, String supportsToolSignature) { + this.id = id; + this.installedToolSignature = installedToolSignature; + this.supportsToolSignature = supportsToolSignature; } /** default constructor */ public ToolImportSupport() { } - - /** - * @hibernate.id generator-class="native" type="java.lang.Long" - * column="id" + /** + * @hibernate.id generator-class="native" type="java.lang.Long" column="id" */ public Long getId() { - return this.id; + return this.id; } public void setId(Long id) { - this.id = id; + this.id = id; } - /** - * @hibernate.property column="installed_tool_signature" - length="15" - not-null="true" + /** + * @hibernate.property column="installed_tool_signature" length="15" not-null="true" */ public String getInstalledToolSignature() { - return this.installedToolSignature; + return this.installedToolSignature; } public void setInstalledToolSignature(String installedToolSignature) { - this.installedToolSignature = installedToolSignature; + this.installedToolSignature = installedToolSignature; } - /** - * @hibernate.property column="supports_tool_signature" - length="50" - not-null="true" + /** + * @hibernate.property column="supports_tool_signature" length="50" not-null="true" */ public String getSupportsToolSignature() { - return this.supportsToolSignature; + return this.supportsToolSignature; } public void setSupportsToolSignature(String supportsToolSignature) { - this.supportsToolSignature = supportsToolSignature; + this.supportsToolSignature = supportsToolSignature; } public String toString() { - return new ToStringBuilder(this) - .append("id", getId()) - .append("installedToolSignature", getInstalledToolSignature()) - .append("supportsToolSignature", getSupportsToolSignature()) - .toString(); + return new ToStringBuilder(this).append("id", getId()) + .append("installedToolSignature", getInstalledToolSignature()) + .append("supportsToolSignature", getSupportsToolSignature()).toString(); } public boolean equals(Object other) { - if ( (this == other ) ) return true; - if ( !(other instanceof ToolImportSupport) ) return false; - ToolImportSupport castOther = (ToolImportSupport) other; - return new EqualsBuilder() - .append(this.getId(), castOther.getId()) - .append(this.getInstalledToolSignature(), castOther.getInstalledToolSignature()) - .append(this.getSupportsToolSignature(), castOther.getSupportsToolSignature()) - .isEquals(); + if ((this == other)) + return true; + if (!(other instanceof ToolImportSupport)) + return false; + ToolImportSupport castOther = (ToolImportSupport) other; + return new EqualsBuilder().append(this.getId(), castOther.getId()) + .append(this.getInstalledToolSignature(), castOther.getInstalledToolSignature()) + .append(this.getSupportsToolSignature(), castOther.getSupportsToolSignature()).isEquals(); } public int hashCode() { - return new HashCodeBuilder() - .append(getId()) - .toHashCode(); + return new HashCodeBuilder().append(getId()).toHashCode(); } } Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java =================================================================== diff -u -r70a60f2862830ca6bd07e2b1252af3d79e4939af -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java (.../ToolSession.java) (revision 70a60f2862830ca6bd07e2b1252af3d79e4939af) +++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java (.../ToolSession.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -34,10 +34,6 @@ import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.usermanagement.User; -/** - * @hibernate.class table="lams_tool_session" - * - */ public abstract class ToolSession implements Serializable { /** Tool session type id for grouped */ @@ -87,11 +83,6 @@ public ToolSession() { } - /** - * @hibernate.id generator-class="native" type="java.lang.Long" - * column="tool_session_id" - * - */ public Long getToolSessionId() { return this.toolSessionId; } @@ -100,11 +91,6 @@ this.toolSessionId = toolSessionId; } - /** - * - * @hibernate.many-to-one not-null="true" - * @hibernate.column name="activity_id" - */ public ToolActivity getToolActivity() { return this.toolActivity; } @@ -113,9 +99,6 @@ this.toolActivity = toolActivity; } - /** - * @hibernate.property column="create_date_time" length="19" not-null="true" - */ public Date getCreateDateTime() { return this.createDateTime; } @@ -125,7 +108,6 @@ } /** - * @hibernate.property column="unique_key" length="128" not-null="true" * @return Returns the uniqueKey. */ public String getUniqueKey() { @@ -140,11 +122,6 @@ this.uniqueKey = uniqueKey; } - /** - * @hibernate.property column="tool_session_name" length="255" - * not-null="true" - * @return - */ public String getToolSessionName() { return toolSessionName; } @@ -153,11 +130,6 @@ this.toolSessionName = toolSessionName; } - /** - * @hibernate.many-to-one not-null="true" - * @hibernate.column name="tool_session_state_id" - * - */ public int getToolSessionStateId() { return this.toolSessionStateId; } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/AuthenticationMethod.java =================================================================== diff -u -r5e828bbc5f2a11fa8b55f616b1eb0e4c0489c68a -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/AuthenticationMethod.java (.../AuthenticationMethod.java) (revision 5e828bbc5f2a11fa8b55f616b1eb0e4c0489c68a) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/AuthenticationMethod.java (.../AuthenticationMethod.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -30,18 +30,13 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -/** - * @hibernate.class - * table="lams_authentication_method" - * -*/ @SuppressWarnings("serial") public class AuthenticationMethod implements Serializable { - - public static final Integer DB = 1; - public static final Integer WEBAUTH = 2; - public static final Integer LDAP = 3; - + + public static final Integer DB = 1; + public static final Integer WEBAUTH = 2; + public static final Integer LDAP = 3; + /** identifier field */ private Integer authenticationMethodId; @@ -53,117 +48,82 @@ /** persistent field */ private Set users; - + private boolean enabled = true; /** full constructor */ - public AuthenticationMethod(String authenticationMethodName, AuthenticationMethodType authenticationMethodType, Set users) { - this.authenticationMethodName = authenticationMethodName; - this.authenticationMethodType = authenticationMethodType; - this.users = users; + public AuthenticationMethod(String authenticationMethodName, AuthenticationMethodType authenticationMethodType, + Set users) { + this.authenticationMethodName = authenticationMethodName; + this.authenticationMethodType = authenticationMethodType; + this.users = users; } /** default constructor */ public AuthenticationMethod() { } - - /** - * @hibernate.id - * generator-class="native" - * type="java.lang.Integer" - * column="authentication_method_id" - * - */ public Integer getAuthenticationMethodId() { - return this.authenticationMethodId; + return this.authenticationMethodId; } public void setAuthenticationMethodId(Integer authenticationMethodId) { - this.authenticationMethodId = authenticationMethodId; + this.authenticationMethodId = authenticationMethodId; } - /** - * @hibernate.property - * column="authentication_method_name" - * unique="true" - * length="64" - * not-null="true" - * - */ public String getAuthenticationMethodName() { - return this.authenticationMethodName; + return this.authenticationMethodName; } public void setAuthenticationMethodName(String authenticationMethodName) { - this.authenticationMethodName = authenticationMethodName; + this.authenticationMethodName = authenticationMethodName; } - - /** - * @hibernate.many-to-one - * not-null="true" - * lazy="false" - * @hibernate.column name="authentication_method_type_id" - * - */ + public AuthenticationMethodType getAuthenticationMethodType() { - return this.authenticationMethodType; + return this.authenticationMethodType; } public void setAuthenticationMethodType(AuthenticationMethodType AuthenticationMethodType) { - this.authenticationMethodType = AuthenticationMethodType; + this.authenticationMethodType = AuthenticationMethodType; } - /** - * @hibernate.set - * lazy="true" - * inverse="true" - * cascade="none" - * @hibernate.collection-key - * column="authentication_method_id" - * @hibernate.collection-one-to-many - * class="org.lamsfoundation.lams.usermanagement.User" - * - */ public Set getUsers() { - return this.users; + return this.users; } public void setUsers(Set users) { - this.users = users; + this.users = users; } - /** - * @return Returns the enabled. - */ - public boolean isEnabled() { - return enabled; - } - /** - * @param enabled The enabled to set. - */ - public void setEnabled(boolean enabled) { - this.enabled = enabled; - } - + /** + * @return Returns the enabled. + */ + public boolean isEnabled() { + return enabled; + } + + /** + * @param enabled + * The enabled to set. + */ + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + public String toString() { - return new ToStringBuilder(this) - .append("authenticationMethodId", getAuthenticationMethodId()) - .toString(); + return new ToStringBuilder(this).append("authenticationMethodId", getAuthenticationMethodId()).toString(); } public boolean equals(Object other) { - if ( !(other instanceof AuthenticationMethod) ) return false; - AuthenticationMethod castOther = (AuthenticationMethod) other; - return new EqualsBuilder() - .append(this.getAuthenticationMethodId(), castOther.getAuthenticationMethodId()) - .isEquals(); + if (!(other instanceof AuthenticationMethod)) + return false; + AuthenticationMethod castOther = (AuthenticationMethod) other; + return new EqualsBuilder().append(this.getAuthenticationMethodId(), castOther.getAuthenticationMethodId()) + .isEquals(); } public int hashCode() { - return new HashCodeBuilder() - .append(getAuthenticationMethodId()) - .toHashCode(); + return new HashCodeBuilder().append(getAuthenticationMethodId()).toHashCode(); } } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.java =================================================================== diff -u -raa7e502bb28fa1df94980fadea3876a83e842ae4 -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.java (.../AuthenticationMethodType.java) (revision aa7e502bb28fa1df94980fadea3876a83e842ae4) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.java (.../AuthenticationMethodType.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -29,11 +29,6 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -/** - * @hibernate.class - * table="lams_auth_method_type" - * -*/ public class AuthenticationMethodType implements Serializable { public static final String LAMS = "LAMS"; @@ -59,13 +54,6 @@ public AuthenticationMethodType() { } - /** - * @hibernate.id - * generator-class="native" - * type="java.lang.Integer" - * column="authentication_method_type_id" - * - */ public Integer getAuthenticationMethodTypeId() { return this.authenticationMethodTypeId; } @@ -74,13 +62,6 @@ this.authenticationMethodTypeId = authenticationMethodTypeId; } - /** - * @hibernate.property - * column="description" - * length="64" - * not-null="true" - * - */ public String getDescription() { return this.description; } @@ -89,17 +70,6 @@ this.description = description; } - /** - * @hibernate.set - * lazy="true" - * inverse="true" - * cascade="none" - * @hibernate.collection-key - * column="authentication_method_type_id" - * @hibernate.collection-one-to-many - * class="org.lamsfoundation.lams.usermanagement.AuthenticationMethod" - * - */ public Set getAuthenticationMethods() { return this.authenticationMethods; } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java =================================================================== diff -u -rcb6d628cd53fe3d51e4f67cbaff7390651a048da -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java (.../Organisation.java) (revision cb6d628cd53fe3d51e4f67cbaff7390651a048da) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java (.../Organisation.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -32,10 +32,6 @@ import org.apache.commons.lang.builder.ToStringBuilder; import org.lamsfoundation.lams.usermanagement.dto.OrganisationDTO; -/** - * @hibernate.class table="lams_organisation" - * - */ public class Organisation implements Serializable, Comparable { private static final long serialVersionUID = -6742443056151585129L; @@ -174,10 +170,6 @@ this.organisationType = organisationType; } - /** - * @hibernate.id generator-class="native" type="java.lang.Integer" column="organisation_id" - * - */ public Integer getOrganisationId() { return this.organisationId; } @@ -186,10 +178,6 @@ this.organisationId = organisationId; } - /** - * @hibernate.property column="name" length="250" - * - */ public String getName() { return this.name; } @@ -198,10 +186,6 @@ this.name = name; } - /** - * @hibernate.property column="code" length="20" - * - */ public String getCode() { return this.code; } @@ -210,10 +194,6 @@ this.code = code; } - /** - * @hibernate.property column="description" length="250" - * - */ public String getDescription() { return this.description; } @@ -222,11 +202,6 @@ this.description = description; } - /** - * @hibernate.many-to-one - * @hibernate.column name="parent_organisation_id" - * - */ public Organisation getParentOrganisation() { return this.parentOrganisation; } @@ -235,10 +210,6 @@ this.parentOrganisation = parentOrganisation; } - /** - * @hibernate.property column="create_date" length="19" not-null="true" - * - */ public Date getCreateDate() { return this.createDate; } @@ -247,11 +218,6 @@ this.createDate = createDate; } - /** - * @hibernate.many-to-one not-null="true" - * @hibernate.column name="created_by" - * - */ public User getCreatedBy() { return this.createdBy; } @@ -260,11 +226,6 @@ this.createdBy = createdBy; } - /** - * @hibernate.many-to-one cascade="all" not-null="false" - * @hibernate.column name="workspace_id" - * - */ public Workspace getWorkspace() { return this.workspace; } @@ -273,10 +234,6 @@ this.workspace = workspace; } - /** - * @hibernate.many-to-one not-null="true" - * - */ public OrganisationType getOrganisationType() { return this.organisationType; } @@ -285,12 +242,6 @@ this.organisationType = organisationType; } - /** - * @hibernate.set lazy="true" inverse="true" cascade="none" - * @hibernate.collection-key column="organisation_id" - * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.usermanagement.UserOrganisation" - * - */ public Set getUserOrganisations() { return this.userOrganisations; } @@ -299,12 +250,6 @@ this.userOrganisations = userOrganisations; } - /** - * @hibernate.set lazy="true" inverse="true" cascade="none" - * @hibernate.collection-key column="parent_organisation_id" - * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.usermanagement.Organisation" - * - */ public Set getChildOrganisations() { return childOrganisations; } @@ -313,12 +258,6 @@ this.childOrganisations = childOrganisations; } - /** - * @hibernate.set lazy="true" inverse="true" cascade="none" - * @hibernate.collection-key column="organisation_id" - * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.lesson.Lesson" - * - */ public Set getLessons() { return this.lessons; } @@ -327,11 +266,6 @@ this.lessons = lessons; } - /** - * @hibernate.many-to-one not-null="true" - * @hibernate.column name="organisation_state_id" - * - */ public OrganisationState getOrganisationState() { return this.organisationState; } @@ -340,10 +274,6 @@ this.organisationState = organisationState; } - /** - * @hibernate.property column="admin_add_new_users" length="1" not-null="true" - * - */ public Boolean getCourseAdminCanAddNewUsers() { return this.courseAdminCanAddNewUsers; } @@ -352,10 +282,6 @@ this.courseAdminCanAddNewUsers = courseAdminCanAddNewUsers; } - /** - * @hibernate.property column="admin_browse_all_users" length="1" not-null="true" - * - */ public Boolean getCourseAdminCanBrowseAllUsers() { return this.courseAdminCanBrowseAllUsers; } @@ -364,10 +290,6 @@ this.courseAdminCanBrowseAllUsers = courseAdminCanBrowseAllUsers; } - /** - * @hibernate.property column="admin_change_status" length="1" not-null="true" - * - */ public Boolean getCourseAdminCanChangeStatusOfCourse() { return this.courseAdminCanChangeStatusOfCourse; } @@ -376,10 +298,6 @@ this.courseAdminCanChangeStatusOfCourse = courseAdminCanChangeStatusOfCourse; } - /** - * @hibernate.property column="admin_create_guest" length="1" not-null="true" - * - */ public Boolean getCourseAdminCanCreateGuestAccounts() { return this.courseAdminCanCreateGuestAccounts; } @@ -388,10 +306,6 @@ this.courseAdminCanCreateGuestAccounts = courseAdminCanCreateGuestAccounts; } - /** - * @hibernate.property column="enable_course_notifications" length="1" not-null="true" - * - */ public Boolean getEnableCourseNotifications() { return this.enableCourseNotifications; } @@ -419,11 +333,6 @@ return new OrganisationDTO(this); } - /** - * @hibernate.many-to-one not-null="true" lazy="false" - * @hibernate.column name="locale_id" - * @param localeCountry - */ public SupportedLocale getLocale() { return locale; } @@ -436,10 +345,6 @@ return name.compareToIgnoreCase(((Organisation) o).getName()); } - /** - * @hibernate.property column="archived_date" length="19" not-null="false" - * - */ public Date getArchivedDate() { return this.archivedDate; } @@ -448,9 +353,6 @@ this.archivedDate = archivedDate; } - /** - * @hibernate.property column="ordered_lesson_ids" length="65535" - */ public String getOrderedLessonIds() { return orderedLessonIds; } @@ -459,10 +361,6 @@ this.orderedLessonIds = orderedLessonIds; } - /** - * @hibernate.property column="enable_teacher_gradebook" length="1" not-null="true" - * - */ public Boolean getEnableGradebookForMonitors() { return enableGradebookForMonitors; } @@ -471,10 +369,6 @@ this.enableGradebookForMonitors = enableGradebookForMonitors; } - /** - * @hibernate.property column="enable_learner_gradebook" length="1" not-null="true" - * - */ public Boolean getEnableGradebookForLearners() { return enableGradebookForLearners; } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/OrganisationState.java =================================================================== diff -u -r13c47d399079823287f05f7e65f5a40b3e924460 -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/OrganisationState.java (.../OrganisationState.java) (revision 13c47d399079823287f05f7e65f5a40b3e924460) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/OrganisationState.java (.../OrganisationState.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -4,12 +4,6 @@ import java.util.Set; import org.apache.commons.lang.builder.ToStringBuilder; - -/** - * @hibernate.class - * table="lams_organisation_state" - * -*/ public class OrganisationState implements Serializable { public static final Integer ACTIVE = 1; @@ -41,13 +35,6 @@ this.Organisations = Organisations; } - /** - * @hibernate.id - * generator-class="native" - * type="java.lang.Integer" - * column="organisation_state_id" - * - */ public Integer getOrganisationStateId() { return this.organisationStateId; } @@ -56,12 +43,6 @@ this.organisationStateId = organisationStateId; } - /** - * @hibernate.property - * column="description" - * length="255" - * - */ public String getDescription() { return this.description; } @@ -70,17 +51,6 @@ this.description = description; } - /** - * @hibernate.set - * lazy="true" - * inverse="true" - * cascade="none" - * @hibernate.collection-key - * column="organisation_state_id" - * @hibernate.collection-one-to-many - * class="org.lamsfoundation.lams.usermanagement.Organisation" - * - */ public Set getOrganisations() { return this.Organisations; } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/OrganisationType.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/OrganisationType.java (.../OrganisationType.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/OrganisationType.java (.../OrganisationType.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -29,11 +29,6 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -/** - * @hibernate.class - * table="lams_organisation_type" - * -*/ public class OrganisationType implements Serializable { public static final Integer ROOT_TYPE = 1; @@ -67,13 +62,6 @@ public OrganisationType() { } - /** - * @hibernate.id - * generator-class="increment" - * type="java.lang.Integer" - * column="organisation_type_id" - * - */ public Integer getOrganisationTypeId() { return this.organisationTypeId; } @@ -82,14 +70,6 @@ this.organisationTypeId = organisationTypeId; } - /** - * @hibernate.property - * column="name" - * unique="true" - * length="64" - * not-null="true" - * - */ public String getName() { return this.name; } @@ -98,13 +78,6 @@ this.name = name; } - /** - * @hibernate.property - * column="description" - * length="255" - * not-null="true" - * - */ public String getDescription() { return this.description; } @@ -113,17 +86,6 @@ this.description = description; } - /** - * @hibernate.set - * lazy="true" - * inverse="true" - * cascade="none" - * @hibernate.collection-key - * column="organisation_type_id" - * @hibernate.collection-one-to-many - * class="org.lamsfoundation.lams.usermanagement.Organisation" - * - */ public Set getOrganisations() { return this.organisations; } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Privilege.java =================================================================== diff -u -raf7bc7f9e66df064739240f751ba03ffdc74795f -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Privilege.java (.../Privilege.java) (revision af7bc7f9e66df064739240f751ba03ffdc74795f) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Privilege.java (.../Privilege.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -4,12 +4,6 @@ import java.util.Set; import org.apache.commons.lang.builder.ToStringBuilder; - -/** - * @hibernate.class - * table="lams_privilege" - * -*/ public class Privilege implements Serializable { /** identifier field */ @@ -41,13 +35,6 @@ this.rolePrivileges = rolePrivileges; } - /** - * @hibernate.id - * generator-class="native" - * type="java.lang.Long" - * column="privilege_id" - * - */ public Long getPrivilegeId() { return this.privilegeId; } @@ -56,14 +43,6 @@ this.privilegeId = privilegeId; } - /** - * @hibernate.property - * column="code" - * unique="true" - * length="10" - * not-null="true" - * - */ public String getCode() { return this.code; } @@ -72,12 +51,6 @@ this.code = code; } - /** - * @hibernate.property - * column="description" - * length="255" - * - */ public String getDescription() { return this.description; } @@ -86,17 +59,6 @@ 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; } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java =================================================================== diff -u -r4a2728da7ea82a98b92d3a8b08feb6efa4023b7d -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java (.../Role.java) (revision 4a2728da7ea82a98b92d3a8b08feb6efa4023b7d) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Role.java (.../Role.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -31,11 +31,6 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -/** - * @hibernate.class - * table="lams_role" - * -*/ public class Role implements Serializable,Comparable{ public static final String LEARNER = "LEARNER"; @@ -102,13 +97,6 @@ this.userOrganisationRoles = userOrganisationRoles; } - /** - * @hibernate.id - * generator-class="native" - * type="java.lang.Integer" - * column="role_id" - * - */ public Integer getRoleId() { return this.roleId; } @@ -117,13 +105,6 @@ this.roleId = roleId; } - /** - * @hibernate.property - * column="name" - * length="64" - * not-null="true" - * - */ public String getName() { return this.name; } @@ -132,12 +113,6 @@ this.name = name; } - /** - * @hibernate.property - * column="description" - * length="65535" - * - */ public String getDescription() { return this.description; } @@ -146,36 +121,14 @@ this.description = 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.UserOrganisationRole" - * - */ public Set getUserOrganisationRoles() { return this.userOrganisationRoles; } public void setUserOrganisationRoles(Set userOrganisationRoles) { this.userOrganisationRoles = userOrganisationRoles; } - - /** - * @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; } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/RolePrivilege.java =================================================================== diff -u -rd1cc2d262a5d51ba3ea5f3f42d4066fc9f9042c7 -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/RolePrivilege.java (.../RolePrivilege.java) (revision d1cc2d262a5d51ba3ea5f3f42d4066fc9f9042c7) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/RolePrivilege.java (.../RolePrivilege.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -4,11 +4,6 @@ import org.apache.commons.lang.builder.ToStringBuilder; -/** - * @hibernate.class - * table="lams_role_privilege" - * -*/ public class RolePrivilege implements Serializable { /** identifier field */ @@ -30,13 +25,6 @@ public RolePrivilege() { } - /** - * @hibernate.id - * generator-class="native" - * type="java.lang.Long" - * column="rp_id" - * - */ public Long getRpId() { return this.rpId; } @@ -45,12 +33,6 @@ this.rpId = rpId; } - /** - * @hibernate.many-to-one - * not-null="true" - * @hibernate.column name="privilege_id" - * - */ public Privilege getPrivilege() { return this.privilege; } @@ -59,12 +41,6 @@ this.privilege = privilege; } - /** - * @hibernate.many-to-one - * not-null="true" - * @hibernate.column name="role_id" - * - */ public Role getRole() { return this.role; } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/SupportedLocale.java =================================================================== diff -u -r6a5cc0e13ccef6c57ea650bfa9c2e68f5dbe8ab1 -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/SupportedLocale.java (.../SupportedLocale.java) (revision 6a5cc0e13ccef6c57ea650bfa9c2e68f5dbe8ab1) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/SupportedLocale.java (.../SupportedLocale.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -4,12 +4,6 @@ import org.apache.commons.lang.builder.ToStringBuilder; - -/** - * @hibernate.class - * table="lams_supported_locale" - * -*/ public class SupportedLocale implements Serializable,Comparable { /** @@ -48,13 +42,6 @@ public SupportedLocale() { } - /** - * @hibernate.id - * generator-class="native" - * type="java.lang.Integer" - * column="locale_id" - * - */ public Integer getLocaleId() { return this.localeId; } @@ -63,14 +50,6 @@ this.localeId = localeId; } - /** - * @hibernate.property - * column="language_iso_code" - * unique="false" - * length="2" - * not-null="true" - * - */ public String getLanguageIsoCode() { return languageIsoCode; } @@ -79,14 +58,6 @@ this.languageIsoCode = languageIsoCode; } - /** - * @hibernate.property - * column="country_iso_code" - * unique="false" - * length="2" - * not-null="false" - * - */ public String getCountryIsoCode() { return countryIsoCode; } @@ -95,30 +66,14 @@ this.countryIsoCode = countryIsoCode; } - /** - * @hibernate.property - * column="description" - * unique="false" - * length="255" - * not-null="true" - * - */ public String getDescription() { return description; } public void setDescription(String description) { this.description = description; } - - /** - * @hibernate.property - * column="direction" - * unique="false" - * length="3" - * not-null="true" - * - */ + public String getDirection() { return direction; } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java =================================================================== diff -u -rd64f99e274c89f686642247169f37e3b0c731aaa -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (.../User.java) (revision d64f99e274c89f686642247169f37e3b0c731aaa) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (.../User.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -41,10 +41,6 @@ import org.lamsfoundation.lams.usermanagement.dto.UserFlashDTO; import org.lamsfoundation.lams.util.LanguageUtil; -/** - * @hibernate.class table="lams_user" - * - */ public class User implements Serializable, Comparable { /** identifier field */ @@ -185,10 +181,6 @@ changePassword = false; } - /** - * @hibernate.id generator-class="native" type="java.lang.Integer" column="user_id" - * - */ public Integer getUserId() { return userId; } @@ -197,10 +189,6 @@ this.userId = userId; } - /** - * @hibernate.property column="login" length="255" unique="true" not-null="true" - * - */ public String getLogin() { return login; } @@ -209,10 +197,6 @@ this.login = login; } - /** - * @hibernate.property column="password" length="50" not-null="true" - * - */ public String getPassword() { return password; } @@ -221,10 +205,6 @@ this.password = password; } - /** - * @hibernate.property column="title" length="32" - * - */ public String getTitle() { return title; } @@ -233,10 +213,6 @@ this.title = title; } - /** - * @hibernate.property column="first_name" length="128" - * - */ public String getFirstName() { return firstName; } @@ -245,10 +221,6 @@ this.firstName = firstName; } - /** - * @hibernate.property column="last_name" length="128" - * - */ public String getLastName() { return lastName; } @@ -261,10 +233,6 @@ return this.getFirstName() + " " + this.getLastName(); } - /** - * @hibernate.property column="address_line_1" length="64" - * - */ public String getAddressLine1() { return addressLine1; } @@ -273,10 +241,6 @@ this.addressLine1 = addressLine1; } - /** - * @hibernate.property column="address_line_2" length="64" - * - */ public String getAddressLine2() { return addressLine2; } @@ -285,10 +249,6 @@ this.addressLine2 = addressLine2; } - /** - * @hibernate.property column="address_line_3" length="64" - * - */ public String getAddressLine3() { return addressLine3; } @@ -297,10 +257,6 @@ this.addressLine3 = addressLine3; } - /** - * @hibernate.property column="city" length="64" - * - */ public String getCity() { return city; } @@ -309,10 +265,6 @@ this.city = city; } - /** - * @hibernate.property column="state" length="64" - * - */ public String getState() { return state; } @@ -321,10 +273,6 @@ this.state = state; } - /** - * @hibernate.property column="postcode" length="10" - * - */ public String getPostcode() { return postcode; } @@ -333,10 +281,6 @@ this.postcode = postcode; } - /** - * @hibernate.property column="country" length="64" - * - */ public String getCountry() { return country; } @@ -345,10 +289,6 @@ this.country = country; } - /** - * @hibernate.property column="day_phone" length="64" - * - */ public String getDayPhone() { return dayPhone; } @@ -357,10 +297,6 @@ this.dayPhone = dayPhone; } - /** - * @hibernate.property column="evening_phone" length="64" - * - */ public String getEveningPhone() { return eveningPhone; } @@ -369,10 +305,6 @@ this.eveningPhone = eveningPhone; } - /** - * @hibernate.property column="mobile_phone" length="64" - * - */ public String getMobilePhone() { return mobilePhone; } @@ -381,10 +313,6 @@ this.mobilePhone = mobilePhone; } - /** - * @hibernate.property column="fax" length="64" - * - */ public String getFax() { return fax; } @@ -393,10 +321,6 @@ this.fax = fax; } - /** - * @hibernate.property column="email" length="128" - * - */ public String getEmail() { return email; } @@ -405,10 +329,6 @@ this.email = email; } - /** - * @hibernate.property column="disabled_flag" length="1" not-null="true" - * - */ public Boolean getDisabledFlag() { return disabledFlag; } @@ -417,10 +337,6 @@ this.disabledFlag = disabledFlag; } - /** - * @hibernate.property column="create_date" length="19" not-null="true" - * - */ public Date getCreateDate() { return createDate; } @@ -429,11 +345,6 @@ this.createDate = createDate; } - /** - * @hibernate.many-to-one not-null="true" lazy="false" cascade="all" - * @hibernate.column name="workspace_id" - * - */ public Workspace getWorkspace() { return workspace; } @@ -442,11 +353,6 @@ this.workspace = workspace; } - /** - * @hibernate.many-to-one not-null="true" lazy="false" - * @hibernate.column name="authentication_method_id" - * - */ public AuthenticationMethod getAuthenticationMethod() { return authenticationMethod; } @@ -455,11 +361,6 @@ this.authenticationMethod = authenticationMethod; } - /** - * @hibernate.many-to-one not-null="false" - * @hibernate.column name="flash_theme_id" - * - */ public Theme getFlashTheme() { return flashTheme; } @@ -468,11 +369,6 @@ this.flashTheme = flashTheme; } - /** - * @hibernate.many-to-one not-null="false" - * @hibernate.column name="html_theme_id" - * - */ public Theme getHtmlTheme() { return htmlTheme; } @@ -481,10 +377,6 @@ this.htmlTheme = htmlTheme; } - /** - * @hibernate.property column="chat_id" length="255" - * - */ public String getChatId() { return chatId; } @@ -493,12 +385,6 @@ this.chatId = chatId; } - /** - * @hibernate.set lazy="true" inverse="true" cascade="none" - * @hibernate.collection-key column="user_id" - * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.usermanagement.UserOrganisation" - * - */ public Set getUserOrganisations() { return userOrganisations; } @@ -515,12 +401,6 @@ userOrganisations.add(userOrganisation); } - /** - * @hibernate.set lazy="true" inverse="true" cascade="none" - * @hibernate.collection-key column="user_id" - * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.lesson.LearnerProgress" - * - */ public Set getLearnerProgresses() { return learnerProgresses; } @@ -529,12 +409,6 @@ this.learnerProgresses = learnerProgresses; } - /** - * @hibernate.set lazy="true" inverse="true" cascade="none" - * @hibernate.collection-key column="user_id" - * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.lesson.UserToolSession" - * - */ public Set getUserToolSessions() { return userToolSessions; } @@ -543,12 +417,6 @@ this.userToolSessions = userToolSessions; } - /** - * @hibernate.set lazy="true" inverse="true" cascade="none" - * @hibernate.collection-key column="user_id" - * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.LearningDesign" - * - */ public Set getLearningDesigns() { return learningDesigns; } @@ -557,12 +425,6 @@ this.learningDesigns = learningDesigns; } - /** - * @hibernate.set lazy="true" inverse="true" cascade="none" - * @hibernate.collection-key column="user_id" - * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.Lesson" - * - */ public Set getLessons() { return lessons; } @@ -692,11 +554,6 @@ return foundMemberFolder; } - /** - * @hibernate.many-to-one not-null="true" lazy="false" - * @hibernate.column name="locale_id" - * @param localeCountry - */ public SupportedLocale getLocale() { return locale; } @@ -705,10 +562,6 @@ this.locale = locale; } - /** - * @hibernate.property column="portrait_uuid" length="20" - * - */ public Long getPortraitUuid() { return portraitUuid; } @@ -717,10 +570,6 @@ this.portraitUuid = portraitUuid; } - /** - * @hibernate.property column="change_password" length="1" not-null="true" - * - */ public Boolean getChangePassword() { return changePassword; } @@ -729,10 +578,6 @@ this.changePassword = changePassword; } - /** - * @hibernate.property column="enable_flash" length="1" not-null="true" - * - */ public Boolean getEnableFlash() { return enableFlash; } @@ -741,10 +586,6 @@ this.enableFlash = enableFlash; } - /** - * @hibernate.property column="lams_community_token" length="255" not-null="false" - * - */ public String getLamsCommunityToken() { return lamsCommunityToken; } @@ -753,10 +594,6 @@ this.lamsCommunityToken = lamsCommunityToken; } - /** - * @hibernate.property column="lams_community_username" length="255" not-null="false" - * - */ public String getLamsCommunityUsername() { return lamsCommunityUsername; } @@ -765,12 +602,6 @@ this.lamsCommunityUsername = lamsCommunityUsername; } - /** - * Returns user's time zone. If NULL, returns server default time zone. - * - * @hibernate.property column="timezone" length="255" - * - */ public String getTimeZone() { if (timeZone == null) { timeZone = TimeZone.getDefault().getID(); @@ -782,10 +613,6 @@ this.timeZone = timeZone; } - /** - * @hibernate.property column="tutorials_disabled" length="1" - * - */ public Boolean getTutorialsDisabled() { return tutorialsDisabled; } @@ -794,11 +621,6 @@ this.tutorialsDisabled = tutorialsDisabled; } - /** - * @hibernate.set lazy="false" cascade="all-delete-orphan" - * @hibernate.collection-key column="user_id" - * @hibernate.collection-element column="page_str" type="string" length="5" not-null="true" - */ public Set getPagesWithDisabledTutorials() { return pagesWithDisabledTutorials; } @@ -807,10 +629,6 @@ this.pagesWithDisabledTutorials = pagesWithDisabledTutorials; } - /** - * @hibernate.property column="first_login" length="1" - * - */ public Boolean isFirstLogin() { return firstLogin; } @@ -819,12 +637,6 @@ this.firstLogin = firstLogin; } - /** - * @hibernate.set lazy="true" table="lams_planner_recent_learning_designs" cascade="all-delete-orphan" - * order-by="last_modified_date DESC" - * @hibernate.collection-key column="user_id" - * @hibernate.collection-element column="learning_design_id" type="long" not-null="true" - */ public Set getRecentlyModifiedLearningDesigns() { return recentlyModifiedLearningDesigns; } @@ -833,10 +645,6 @@ this.recentlyModifiedLearningDesigns = recentlyModifiedLearningDesigns; } - /** - * @hibernate.property column="modified_date" length="19" not-null="false" - * @return - */ public Date getModifiedDate() { return modifiedDate; } @@ -845,10 +653,6 @@ this.modifiedDate = modifiedDate; } - /** - * @hibernate.property column="openid_url" not-null="false" - * @return - */ public String getOpenidURL() { return openidURL; } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisation.java =================================================================== diff -u -r07578aaa7f526c0c1b537c127cf5f88e0410d472 -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisation.java (.../UserOrganisation.java) (revision 07578aaa7f526c0c1b537c127cf5f88e0410d472) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisation.java (.../UserOrganisation.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -30,11 +30,6 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -/** - * @hibernate.class - * table="lams_user_organisation" - * -*/ public class UserOrganisation implements Serializable { /** identifier field */ @@ -68,13 +63,6 @@ public UserOrganisation() { } - /** - * @hibernate.id - * generator-class="native" - * type="java.lang.Integer" - * column="user_organisation_id" - * - */ public Integer getUserOrganisationId() { return this.userOrganisationId; } @@ -83,12 +71,6 @@ this.userOrganisationId = userOrganisationId; } - /** - * @hibernate.many-to-one - * not-null="true" - * @hibernate.column name="user_id" - * - */ public User getUser() { return this.user; } @@ -97,12 +79,6 @@ this.user = user; } - /** - * @hibernate.many-to-one - * not-null="true" - * @hibernate.column name="organisation_id" - * - */ public Organisation getOrganisation() { return this.organisation; } @@ -111,32 +87,14 @@ this.organisation = organisation; } - /** - * @hibernate.one-to-one - * name="userOrganisationCollapsed" - * class="org.lamsfoundation.lams.usermanagement.UserOrganisationCollapsed" - * cascade="all" - * - */ public UserOrganisationCollapsed getUserOrganisationCollapsed() { return this.userOrganisationCollapsed; } public void setUserOrganisationCollapsed(UserOrganisationCollapsed uoc) { this.userOrganisationCollapsed = uoc; } - - /** - * @hibernate.set - * lazy="false" - * inverse="true" - * cascade="none" - * @hibernate.collection-key - * column="user_organisation_id" - * @hibernate.collection-one-to-many - * class="org.lamsfoundation.lams.usermanagement.hibernate.userOrganisationRole" - * - */ + public Set getUserOrganisationRoles() { return this.userOrganisationRoles; } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisationRole.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisationRole.java (.../UserOrganisationRole.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisationRole.java (.../UserOrganisationRole.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -28,11 +28,6 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -/** - * @hibernate.class - * table="lams_user_organisation_role" - * -*/ public class UserOrganisationRole implements Serializable { /** identifier field */ @@ -54,13 +49,6 @@ public UserOrganisationRole() { } - /** - * @hibernate.id - * generator-class="native" - * type="java.lang.Integer" - * column="user_organisation_role_id" - * - */ public Integer getUserOrganisationRoleId() { return this.userOrganisationRoleId; } @@ -69,12 +57,6 @@ this.userOrganisationRoleId = userOrganisationRoleId; } - /** - * @hibernate.many-to-one - * not-null="true" - * @hibernate.column name="user_organisation_id" - * - */ public UserOrganisation getUserOrganisation() { return this.userOrganisation; } @@ -83,12 +65,6 @@ this.userOrganisation = userOrganisation; } - /** - * @hibernate.many-to-one - * not-null="true" - * @hibernate.column name="role_id" - * - */ public Role getRole() { return this.role; } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Workspace.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Workspace.java (.../Workspace.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Workspace.java (.../Workspace.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -32,11 +32,6 @@ import org.apache.commons.lang.builder.ToStringBuilder; import org.lamsfoundation.lams.usermanagement.dto.WorkspaceDTO; -/** - * @hibernate.class - * table="lams_workspace" - * -*/ public class Workspace implements Serializable { /** identifier field */ @@ -76,13 +71,6 @@ public Workspace() { } - /** - * @hibernate.id - * generator-class="native" - * type="java.lang.Integer" - * column="workspace_id" - * - */ public Integer getWorkspaceId() { return this.workspaceId; } @@ -91,13 +79,6 @@ this.workspaceId = workspaceId; } - /** - * @hibernate.many-to-one - * not-null="true" - * lazy="false" - * @hibernate.column name="default_fld_id" - * - */ public WorkspaceFolder getDefaultFolder() { return this.defaultFolder; } @@ -108,9 +89,6 @@ /** * WorkspaceWorkspaceFolder is a join object that links a workspace folder to its workspaces. - * @hibernate.set inverse="false" cascade="all-delete-orphan" - * @hibernate.collection-key column="workspace_id" - * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.usermanagement.WorkspaceWorkspaceFolder" */ public Set getWorkspaceWorkspaceFolders() { return workspaceWorkspaceFolders; @@ -155,13 +133,6 @@ getWorkspaceWorkspaceFolders().add(wwf); } - /** - * @hibernate.many-to-one - * not-null="true" - * lazy="false" - * @hibernate.column name="def_run_seq_fld_id" - * - */ public WorkspaceFolder getDefaultRunSequencesFolder() { return defaultRunSequencesFolder; } @@ -170,18 +141,6 @@ this.defaultRunSequencesFolder = defaultRunSequencesFolder; } - - /** - * @hibernate.set - * lazy="true" - * inverse="true" - * cascade="none" - * @hibernate.collection-key - * column="workspace_id" - * @hibernate.collection-one-to-many - * class="org.lamsfoundation.lams.usermanagement.User" - * - */ public Set getUsers() { return this.users; } @@ -190,17 +149,6 @@ this.users = users; } - /** - * @hibernate.set - * lazy="true" - * inverse="true" - * cascade="none" - * @hibernate.collection-key - * column="workspace_id" - * @hibernate.collection-one-to-many - * class="org.lamsfoundation.lams.usermanagement.Organisation" - * - */ public Set getOrganisations() { return this.organisations; } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java =================================================================== diff -u -rb9c68da61a40efc2425fb80c0c1e7b06f8fcfe78 -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java (.../WorkspaceFolder.java) (revision b9c68da61a40efc2425fb80c0c1e7b06f8fcfe78) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java (.../WorkspaceFolder.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -35,8 +35,6 @@ import org.lamsfoundation.lams.workspace.WorkspaceFolderContent; /** - * @hibernate.class table="lams_workspace_folder" - * * @author Fei Yang,Manpreet Minhas * */ @@ -150,13 +148,6 @@ public WorkspaceFolder() { } - /** - * @hibernate.id - * generator-class="native" - * type="java.lang.Integer" - * column="workspace_folder_id" - * - */ public Integer getWorkspaceFolderId() { return this.workspaceFolderId; } @@ -165,25 +156,14 @@ this.workspaceFolderId = workspaceFolderId; } - /** - * @hibernate.property - * column="name" - * length="255" - * not-null="true" - * - */ public String getName() { return this.name; } public void setName(String name) { this.name = name; } - /** - * @hibernate.many-to-one - * @hibernate.column name="parent_folder_id" - * - */ + public WorkspaceFolder getParentWorkspaceFolder() { return this.parentWorkspaceFolder; } @@ -194,9 +174,6 @@ /** * WorkspaceWorkspaceFolder is a join object that links a workspace folder to its workspaces. - * @hibernate.set inverse="false" cascade="all-delete-orphan" - * @hibernate.collection-key column="workspace_folder" - * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.usermanagement.WorkspaceWorkspaceFolder" */ protected Set getWorkspaceWorkspaceFolders() { return workspaceWorkspaceFolders; @@ -219,18 +196,7 @@ } return set; } - - /** - * @hibernate.set - * lazy="true" - * inverse="true" - * cascade="none" - * @hibernate.collection-key - * column="parent_folder_id" - * @hibernate.collection-one-to-many - * class="org.lamsfoundation.lams.usermanagement.WorkspaceFolder" - * - */ + public Set getChildWorkspaceFolders() { return this.childWorkspaceFolders; } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceWorkspaceFolder.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceWorkspaceFolder.java (.../WorkspaceWorkspaceFolder.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceWorkspaceFolder.java (.../WorkspaceWorkspaceFolder.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) @@ -33,10 +33,7 @@ * Join table that maps workspace to workspace folders. Was having trouble getting Hibernate * to persist the join table. * - * @hibernate.class table="lams_wkspc_wkspc_folder" - * * @author Fiona Malikoff - * */ public class WorkspaceWorkspaceFolder implements Serializable { @@ -60,25 +57,15 @@ this.workspace = workspace; this.workspaceFolder = workspaceFolder; } - - /** @hibernate.id - * generator-class="native" - * type="java.lang.Integer" - * column="id" - */ + public Integer getId() { return id; } public void setId(Integer id) { this.id = id; } - /** - * @hibernate.many-to-one - * not-null="true" - * lazy="false" - * @hibernate.column name="workspace_folder_id" - */ + public WorkspaceFolder getWorkspaceFolder() { return this.workspaceFolder; } @@ -87,12 +74,6 @@ this.workspaceFolder = workspaceFolder; } - /** - * @hibernate.many-to-one - * not-null="true" - * lazy="false" - * @hibernate.column name="workspace_id" - */ public Workspace getWorkspace() { return this.workspace; }