Fisheye: Tag 2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/logevent/LogEvent.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/logevent/LogEventType.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e 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 2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/policies/Policy.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/policies/PolicyConsent.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/signup/model/SignupOrganisation.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/timezone/Timezone.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml =================================================================== diff -u -rd5d38057e102e214efbc365d07fed0837c936ada -r2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e --- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision d5d38057e102e214efbc365d07fed0837c936ada) +++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e) @@ -25,7 +25,10 @@ org.lamsfoundation.lams.learningdesign - org.lamsfoundation.lams.tool.**.model + org.lamsfoundation.lams.logevent + org.lamsfoundation.lams.policies + org.lamsfoundation.lams.timezone + org.lamsfoundation.lams.**.model Index: lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e --- lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java (.../LogEvent.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java (.../LogEvent.java) (revision 2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e) @@ -26,6 +26,15 @@ import java.io.Serializable; import java.util.Date; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + import org.lamsfoundation.lams.usermanagement.User; /** @@ -34,6 +43,8 @@ * * */ +@Entity +@Table(name = "lams_log_event") public class LogEvent implements Serializable { private static final long serialVersionUID = 5275008411348257866L; @@ -67,45 +78,47 @@ /** *************************************************************** */ - /** identifier field */ + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - /** */ + @Column(name = "log_event_type_id") private Integer logEventTypeId; - /** persistent field */ //TODO perhaps make this field possible to be null + @ManyToOne + @JoinColumn(name = "user_id") private User user; /** Date this activity was created */ + @Column(name = "occurred_date_time") private Date occurredDateTime; - /** */ + @ManyToOne + @JoinColumn(name = "target_user_id") private User targetUser; - /** */ + @Column(name = "lesson_id") private Long lessonId; - /** */ + @Column(name = "activity_id") private Long activityId; + @Column private String description; /* * For the occurredDateTime fields, if the value is null, then it will default to the current time. */ - /** default constructor */ public LogEvent() { occurredDateTime = new Date(); // default value is set to when the object is created } // --------------------------------------------------------------------- // Getters and Setters // --------------------------------------------------------------------- - /** - * - */ public Long getId() { return id; } @@ -114,9 +127,6 @@ this.id = id; } - /** - * - */ public Integer getLogEventTypeId() { return logEventTypeId; } @@ -125,10 +135,6 @@ this.logEventTypeId = logEventTypeId; } - /** - * - * - */ public User getUser() { return this.user; } @@ -137,9 +143,6 @@ this.user = user; } - /** - * - */ public Date getOccurredDateTime() { return occurredDateTime; } @@ -149,9 +152,6 @@ this.occurredDateTime = occurredDateTime != null ? occurredDateTime : new Date(); } - /** - * - */ public User getTargetUser() { return targetUser; } @@ -160,9 +160,6 @@ this.targetUser = targetUser; } - /** - * - */ public Long getLessonId() { return lessonId; } @@ -171,9 +168,6 @@ this.lessonId = lessonId; } - /** - * - */ public Long getActivityId() { return activityId; } Index: lams_common/src/java/org/lamsfoundation/lams/logevent/LogEventType.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e --- lams_common/src/java/org/lamsfoundation/lams/logevent/LogEventType.java (.../LogEventType.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_common/src/java/org/lamsfoundation/lams/logevent/LogEventType.java (.../LogEventType.java) (revision 2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e) @@ -25,12 +25,28 @@ import java.io.Serializable; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Table(name = "lams_log_event_type") public class LogEventType implements Serializable { private static final long serialVersionUID = 5275008411348257866L; + @Id + @Column(name = "log_event_type_id") + @GeneratedValue(strategy = GenerationType.IDENTITY) private Integer id; + + @Column private String description; + + @Column private String area; public Integer getId() { Index: lams_common/src/java/org/lamsfoundation/lams/notebook/model/NotebookEntry.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e --- lams_common/src/java/org/lamsfoundation/lams/notebook/model/NotebookEntry.java (.../NotebookEntry.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_common/src/java/org/lamsfoundation/lams/notebook/model/NotebookEntry.java (.../NotebookEntry.java) (revision 2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e) @@ -27,33 +27,58 @@ import java.util.Date; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; +import javax.persistence.Transient; + import org.lamsfoundation.lams.usermanagement.User; /** * */ +@Entity +@Table(name = "lams_notebook_entry") public class NotebookEntry implements java.io.Serializable, Cloneable { private static final long serialVersionUID = 653296132134948803L; + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + @Column(name = "external_id") private Long externalID; + @Column(name = "external_id_type") private Integer externalIDType; + @Column(name = "external_signature") private String externalSignature; + @ManyToOne + @JoinColumn(name = "user_id") private User user; + @Column private String title; + @Column private String entry; + @Column(name = "create_date") private Date createDate; + @Column(name = "last_modified") private Date lastModified; + @Transient private String lessonName; public NotebookEntry() { Index: lams_common/src/java/org/lamsfoundation/lams/policies/Policy.java =================================================================== diff -u -r4c134bb552fd30a24e610ddd532846ec38a3a51c -r2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e --- lams_common/src/java/org/lamsfoundation/lams/policies/Policy.java (.../Policy.java) (revision 4c134bb552fd30a24e610ddd532846ec38a3a51c) +++ lams_common/src/java/org/lamsfoundation/lams/policies/Policy.java (.../Policy.java) (revision 2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e) @@ -3,8 +3,22 @@ import java.util.Date; import java.util.Set; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.OrderBy; +import javax.persistence.Table; +import javax.persistence.Transient; + import org.lamsfoundation.lams.usermanagement.User; +@Entity +@Table(name = "lams_policy") public class Policy { /** active policy */ @@ -21,42 +35,54 @@ /** other policy */ public static final Integer TYPE_OTHER = new Integer(4); - /** identifier field */ + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; /** * Shared by all policies created out of one parent one. */ + @Column(name = "policy_id") private Long policyId; - /** persistent field */ + @Column(name = "policy_name") private String policyName; - /** persistent field */ + @Column private String version; - /** persistent field */ + @Column private String summary; - /** persistent field */ + @Column(name = "full_policy") private String fullPolicy; - /** persistent field */ + @Column(name = "policy_state_id") private Integer policyStateId; - /** persistent field */ + @Column(name = "policy_type_id") private Integer policyTypeId; + @ManyToOne + @JoinColumn(name = "created_by") private User createdBy; /** Date this policy was modified the last time */ + @Column(name = "last_modified") private Date lastModified; - + + // inverse = false + @OneToMany(mappedBy = "policy") + @OrderBy("dateAgreedOn ASC") private Set consents; // *************** NON Persistent Fields ******************** + @Transient private boolean hasPreviousVersions; + + @Transient private int userConsentsCount; /** default constructor */ Index: lams_common/src/java/org/lamsfoundation/lams/policies/PolicyConsent.java =================================================================== diff -u -r52ed825cf80fc4c9f1b9e114c80b09913e86002e -r2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e --- lams_common/src/java/org/lamsfoundation/lams/policies/PolicyConsent.java (.../PolicyConsent.java) (revision 52ed825cf80fc4c9f1b9e114c80b09913e86002e) +++ lams_common/src/java/org/lamsfoundation/lams/policies/PolicyConsent.java (.../PolicyConsent.java) (revision 2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e) @@ -2,26 +2,42 @@ import java.util.Date; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + import org.lamsfoundation.lams.usermanagement.User; +@Entity +@Table(name = "lams_policy_consent") public class PolicyConsent { + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + @Column(name = "date_agreed_on") private Date dateAgreedOn; + @ManyToOne + @JoinColumn(name = "policy_uid") private Policy policy; - /** persistent field */ + @ManyToOne + @JoinColumn(name = "user_id") private User user; /** default constructor */ public PolicyConsent() { dateAgreedOn = new Date(); // default value is set to when the object is created } - /** - */ public Long getUid() { return uid; } @@ -39,8 +55,6 @@ this.dateAgreedOn = dateAgreedOn != null ? dateAgreedOn : new Date(); } - /** - */ public Policy getPolicy() { return policy; } Index: lams_common/src/java/org/lamsfoundation/lams/signup/model/SignupOrganisation.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e --- lams_common/src/java/org/lamsfoundation/lams/signup/model/SignupOrganisation.java (.../SignupOrganisation.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_common/src/java/org/lamsfoundation/lams/signup/model/SignupOrganisation.java (.../SignupOrganisation.java) (revision 2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e) @@ -2,31 +2,69 @@ import java.util.Date; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + import org.lamsfoundation.lams.usermanagement.Organisation; /** * Signup organisation. */ +@Entity +@Table(name = "lams_signup_organisation") public class SignupOrganisation { /** * Link on Lams wiki signup help page. */ public static String SIGNUP_HELP_PAGE = "LAMS+Signup"; - /** identifier field */ + @Id + @Column(name = "signup_organisation_id") + @GeneratedValue(strategy = GenerationType.IDENTITY) private Integer signupOrganisationId; + + @ManyToOne + @JoinColumn(name = "organisation_id") private Organisation organisation; + + @Column(name = "add_to_lessons") private Boolean addToLessons; + + @Column(name = "add_as_staff") private Boolean addAsStaff; + + @Column(name = "add_with_author") private Boolean addWithAuthor; + + @Column(name = "add_with_monitor") private Boolean addWithMonitor; + + @Column(name = "email_verify") private Boolean emailVerify; + + @Column(name = "course_key") private String courseKey; + + @Column private String blurb; + + @Column(name = "create_date") private Date createDate; + + @Column private Boolean disabled; + + @Column(name = "login_tab_active") private Boolean loginTabActive; + + @Column private String context; public Integer getSignupOrganisationId() { Index: lams_common/src/java/org/lamsfoundation/lams/timezone/Timezone.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e --- lams_common/src/java/org/lamsfoundation/lams/timezone/Timezone.java (.../Timezone.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_common/src/java/org/lamsfoundation/lams/timezone/Timezone.java (.../Timezone.java) (revision 2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e) @@ -25,6 +25,13 @@ import java.io.Serializable; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + /** * Contains timezone id. * @@ -33,6 +40,8 @@ * * */ +@Entity +@Table(name = "lams_timezone") public class Timezone implements Serializable { /** @@ -43,10 +52,15 @@ private static final long serialVersionUID = 6736816209131888523L; /** identifier field */ + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + @Column(name="timezone_id") private String timezoneId; + @Column(name="server_timezone") private boolean serverTimezone; /** default constructor */