Index: lams_tool_zoom/.classpath =================================================================== diff -u -rbe86c0bc220914398d3ce8ec9ae9cab91b47353a -r7f549341b0c03ba7cd3e0b55f4c1f936ad2da772 --- lams_tool_zoom/.classpath (.../.classpath) (revision be86c0bc220914398d3ce8ec9ae9cab91b47353a) +++ lams_tool_zoom/.classpath (.../.classpath) (revision 7f549341b0c03ba7cd3e0b55f4c1f936ad2da772) @@ -25,6 +25,7 @@ + Fisheye: Tag 7f549341b0c03ba7cd3e0b55f4c1f936ad2da772 refers to a dead (removed) revision in file `lams_tool_zoom/conf/hibernate/mappings/org/lamsfoundation/lams/tool/zoom/model/Zoom.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7f549341b0c03ba7cd3e0b55f4c1f936ad2da772 refers to a dead (removed) revision in file `lams_tool_zoom/conf/hibernate/mappings/org/lamsfoundation/lams/tool/zoom/model/ZoomApi.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7f549341b0c03ba7cd3e0b55f4c1f936ad2da772 refers to a dead (removed) revision in file `lams_tool_zoom/conf/hibernate/mappings/org/lamsfoundation/lams/tool/zoom/model/ZoomSession.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7f549341b0c03ba7cd3e0b55f4c1f936ad2da772 refers to a dead (removed) revision in file `lams_tool_zoom/conf/hibernate/mappings/org/lamsfoundation/lams/tool/zoom/model/ZoomUser.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java =================================================================== diff -u -r6c62e5beb70cd0b72dcec44eaf80ba489a442fb4 -r7f549341b0c03ba7cd3e0b55f4c1f936ad2da772 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java (.../Zoom.java) (revision 6c62e5beb70cd0b72dcec44eaf80ba489a442fb4) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java (.../Zoom.java) (revision 7f549341b0c03ba7cd3e0b55f4c1f936ad2da772) @@ -27,50 +27,77 @@ import java.util.HashSet; 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.Table; + import org.apache.log4j.Logger; -import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; +@Entity +@Table(name = "tl_lazoom10_zoom") public class Zoom implements java.io.Serializable, Cloneable { private static final long serialVersionUID = -336708242652214225L; private static final Logger logger = Logger.getLogger(Zoom.class); - private IToolContentHandler toolContentHandler; - - // Persistent Fields - + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + @Column(name = "create_date") private Date createDate; + @Column(name = "update_date") private Date updateDate; + @Column(name = "create_by") private Long createBy; + @Column private String title; + @Column private String instructions; + @Column(name = "start_in_monitor") private boolean startInMonitor; + @Column private Integer duration = 120; + @Column(name = "reflect_on_activity") private boolean reflectOnActivity; + @Column(name = "reflect_instructions") private String reflectInstructions; + @Column(name = "content_in_use") private boolean contentInUse; + @Column(name = "define_later") private boolean defineLater; + @Column(name = "tool_content_id") private Long toolContentId; + @ManyToOne + @JoinColumn(name = "api_id") private ZoomApi api; + @Column(name = "meeting_id") private String meetingId; + @Column(name = "meeting_start_url") private String meetingStartUrl; + @OneToMany(mappedBy = "zoom") private Set zoomSessions; public Long getUid() { @@ -81,11 +108,6 @@ this.uid = uid; } - /** - * - * - */ - public Date getCreateDate() { return this.createDate; } @@ -94,11 +116,6 @@ this.createDate = createDate; } - /** - * - * - */ - public Date getUpdateDate() { return this.updateDate; } @@ -107,11 +124,6 @@ this.updateDate = updateDate; } - /** - * - * - */ - public Long getCreateBy() { return this.createBy; } @@ -120,11 +132,6 @@ this.createBy = createBy; } - /** - * - * - */ - public String getTitle() { return this.title; } @@ -133,11 +140,6 @@ this.title = title; } - /** - * - * - */ - public String getInstructions() { return this.instructions; } @@ -210,14 +212,6 @@ this.zoomSessions = zoomSessions; } - public IToolContentHandler getToolContentHandler() { - return toolContentHandler; - } - - public void setToolContentHandler(IToolContentHandler toolContentHandler) { - this.toolContentHandler = toolContentHandler; - } - public String getMeetingId() { return meetingId; } @@ -259,11 +253,6 @@ return zoom; } - /** - * toString - * - * @return String - */ @Override public String toString() { StringBuffer buffer = new StringBuffer(); @@ -301,12 +290,11 @@ return result; } - public static Zoom newInstance(Zoom fromContent, Long toContentId, IToolContentHandler zoomToolContentHandler) { + public static Zoom newInstance(Zoom fromContent, Long toContentId) { Zoom toContent = new Zoom(); - fromContent.toolContentHandler = zoomToolContentHandler; toContent = (Zoom) fromContent.clone(); toContent.setToolContentId(toContentId); toContent.setCreateDate(new Date()); return toContent; } -} +} \ No newline at end of file Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomApi.java =================================================================== diff -u -r266434d5ec15cc4026c93a740c3110c046b1d88a -r7f549341b0c03ba7cd3e0b55f4c1f936ad2da772 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomApi.java (.../ZoomApi.java) (revision 266434d5ec15cc4026c93a740c3110c046b1d88a) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomApi.java (.../ZoomApi.java) (revision 7f549341b0c03ba7cd3e0b55f4c1f936ad2da772) @@ -23,26 +23,37 @@ package org.lamsfoundation.lams.tool.zoom.model; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + import org.lamsfoundation.lams.util.JsonUtil; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; -/** - * - */ +@Entity +@Table(name = "tl_lazoom10_api") public class ZoomApi { + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + @Column private String email; + @Column(name = "api_key") private String key; + @Column(name = "api_secret") private String secret; public ZoomApi() { - // default constructor } public ZoomApi(String email, String key, String value) { @@ -77,10 +88,6 @@ this.email = email; } - /** - * - * @return - */ public String getKey() { return key; } @@ -105,4 +112,4 @@ result.put("secret", secret); return result; } -} +} \ No newline at end of file Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomSession.java =================================================================== diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -r7f549341b0c03ba7cd3e0b55f4c1f936ad2da772 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomSession.java (.../ZoomSession.java) (revision 2cf1e086b82a29fae22136351fc7a44821181323) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomSession.java (.../ZoomSession.java) (revision 7f549341b0c03ba7cd3e0b55f4c1f936ad2da772) @@ -27,6 +27,16 @@ import java.util.HashSet; 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.Table; + import org.apache.log4j.Logger; /** @@ -35,29 +45,39 @@ * * */ - +@Entity +@Table(name = "tl_lazoom10_session") public class ZoomSession implements java.io.Serializable { private static final long serialVersionUID = -3248105011578304148L; private static final Logger logger = Logger.getLogger(ZoomSession.class); - // Fields - + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + @Column(name = "session_end_date") private Date sessionEndDate; + @Column(name = "session_start_date") private Date sessionStartDate; + @Column(name = "status") private Integer status; + @Column(name = "session_id") private Long sessionId; + @Column(name = "session_name") private String sessionName; + @ManyToOne + @JoinColumn(name = "zoom_uid") private Zoom zoom; + @OneToMany(mappedBy = "zoomSession") private Set zoomUsers; public Long getUid() { @@ -68,10 +88,6 @@ this.uid = uid; } - /** - * - * - */ public Date getSessionEndDate() { return this.sessionEndDate; } @@ -80,10 +96,6 @@ this.sessionEndDate = sessionEndDate; } - /** - * - * - */ public Date getSessionStartDate() { return this.sessionStartDate; } @@ -92,10 +104,6 @@ this.sessionStartDate = sessionStartDate; } - /** - * - * - */ public Integer getStatus() { return this.status; } @@ -104,10 +112,6 @@ this.status = status; } - /** - * - * - */ public Long getSessionId() { return this.sessionId; } @@ -116,10 +120,6 @@ this.sessionId = sessionId; } - /** - * - * - */ public String getSessionName() { return this.sessionName; } @@ -128,11 +128,6 @@ this.sessionName = sessionName; } - /** - * - * - * - */ public Zoom getZoom() { return this.zoom; } @@ -141,12 +136,6 @@ this.zoom = zoom; } - /** - * - * - * - * - */ public Set getZoomUsers() { return this.zoomUsers; } @@ -155,11 +144,6 @@ this.zoomUsers = zoomUsers; } - /** - * toString - * - * @return String - */ @Override public String toString() { StringBuffer buffer = new StringBuffer(); @@ -211,5 +195,4 @@ } return session; } - -} +} \ No newline at end of file Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomUser.java =================================================================== diff -u -r1db671237e173c5f999e0bbb6c50e5af0cf7c132 -r7f549341b0c03ba7cd3e0b55f4c1f936ad2da772 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomUser.java (.../ZoomUser.java) (revision 1db671237e173c5f999e0bbb6c50e5af0cf7c132) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomUser.java (.../ZoomUser.java) (revision 7f549341b0c03ba7cd3e0b55f4c1f936ad2da772) @@ -23,33 +23,52 @@ package org.lamsfoundation.lams.tool.zoom.model; +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.dto.UserDTO; +@Entity +@Table(name = "tl_lazoom10_user") public class ZoomUser implements java.io.Serializable { private static final long serialVersionUID = 8663555378960558429L; - // Persistent Fields - + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + @Column(name = "user_id") private Integer userId; + @Column(name = "last_name") private String lastName; + @Column(name = "first_name") private String firstName; + @Column(name = "email") private String email; + @ManyToOne + @JoinColumn(name = "zoom_session_uid") private ZoomSession zoomSession; + @Column private boolean finishedActivity; + @Column(name = "notebook_entry_uid") private Long notebookEntryUID; + @Column(name = "meeting_join_url") private String meetingJoinUrl; - // Constructors - public ZoomUser() { } @@ -70,10 +89,6 @@ this.uid = uid; } - /** - * - * - */ public Integer getUserId() { return this.userId; } @@ -122,9 +137,6 @@ this.zoomSession = zoomSession; } - /** - * - */ public Long getNotebookEntryUID() { return notebookEntryUID; } @@ -141,11 +153,6 @@ this.meetingJoinUrl = meetingJoinUrl; } - /** - * toString - * - * @return String - */ @Override public String toString() { StringBuffer buffer = new StringBuffer(); @@ -180,4 +187,4 @@ result = 37 * result + (getUid() == null ? 0 : this.getUid().hashCode()); return result; } -} +} \ No newline at end of file Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java =================================================================== diff -u -r8b8155cc92145959a0fd2fd2aef6689c68ddbc22 -r7f549341b0c03ba7cd3e0b55f4c1f936ad2da772 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java (.../ZoomService.java) (revision 8b8155cc92145959a0fd2fd2aef6689c68ddbc22) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java (.../ZoomService.java) (revision 7f549341b0c03ba7cd3e0b55f4c1f936ad2da772) @@ -193,7 +193,7 @@ // create the fromContent using the default tool content fromContent = getDefaultContent(); } - Zoom toContent = Zoom.newInstance(fromContent, toContentId, zoomToolContentHandler); + Zoom toContent = Zoom.newInstance(fromContent, toContentId); saveOrUpdateZoom(toContent); } @@ -270,8 +270,7 @@ // set ResourceToolContentHandler as null to avoid copy file node in // repository again. - zoom = Zoom.newInstance(zoom, toolContentId, null); - zoom.setToolContentHandler(null); + zoom = Zoom.newInstance(zoom, toolContentId); zoom.setZoomSessions(null); zoom.setApi(null); try { @@ -421,7 +420,7 @@ Zoom defaultContent = getDefaultContent(); // create new zoom using the newContentID Zoom newContent = new Zoom(); - newContent = Zoom.newInstance(defaultContent, newContentID, zoomToolContentHandler); + newContent = Zoom.newInstance(defaultContent, newContentID); saveOrUpdateZoom(newContent); return newContent; }