Index: lams_tool_lamc/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/build.xml,v diff -u -r1.5 -r1.6 --- lams_tool_lamc/build.xml 5 Oct 2005 13:18:53 -0000 1.5 +++ lams_tool_lamc/build.xml 6 Oct 2005 16:01:07 -0000 1.6 @@ -296,7 +296,7 @@ - + @@ -417,8 +417,13 @@ - - + + + + + + + Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/McContent.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/McOptionsContent.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/McQueContent.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/McQueUsr.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/McSession.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/McUsrAttempt.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/Attic/McContent.hbm.xml,v diff -u -r1.3 -r1.4 --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml 1 Oct 2005 16:23:48 -0000 1.3 +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml 6 Oct 2005 16:00:35 -0000 1.4 @@ -192,6 +192,16 @@ /> + + + + Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptionsContent.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/Attic/McOptsContent.hbm.xml,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml 6 Oct 2005 16:00:35 -0000 1.1 @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/Attic/McQueContent.hbm.xml,v diff -u -r1.3 -r1.4 --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml 1 Oct 2005 16:23:48 -0000 1.3 +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml 6 Oct 2005 16:00:35 -0000 1.4 @@ -4,7 +4,13 @@ "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > + + @@ -41,34 +47,23 @@ length="5" > - + - - + + - - - - - - - - - - Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/Attic/McQueUsr.hbm.xml,v diff -u -r1.2 -r1.3 --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml 1 Oct 2005 16:23:48 -0000 1.2 +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml 6 Oct 2005 16:00:35 -0000 1.3 @@ -64,12 +64,13 @@ + Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/Attic/McSession.hbm.xml,v diff -u -r1.2 -r1.3 --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml 1 Oct 2005 15:15:16 -0000 1.2 +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml 6 Oct 2005 16:00:35 -0000 1.3 @@ -26,7 +26,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -272,8 +193,8 @@ - + @@ -330,9 +251,9 @@
- +
- + @@ -347,7 +268,7 @@ - + @@ -360,15 +281,28 @@ - + - + + + + + + + + + + + + + + @@ -380,33 +314,26 @@ - - - - - - - - + - + - +
- +
- + @@ -421,7 +348,7 @@ - + @@ -434,28 +361,21 @@ - + - - - + + + + + + + + + - + - - - - - - - - - - - - - @@ -467,26 +387,33 @@ + + + + + + + - + - + - +
- +
- + @@ -501,19 +428,6 @@ - - - - - - - - - - - - - @@ -527,7 +441,7 @@ - + @@ -540,66 +454,40 @@ - + - - - - - - - - - + + + - + - - - - - - - + - + - + - - - - - - - - - - - - - -
- +
- + @@ -614,7 +502,7 @@ - + @@ -627,21 +515,27 @@ - + - - - - - - - - - + + - + + + + + + + + + + + + + + @@ -653,26 +547,19 @@ - - - - - - - - + - + - + Index: lams_tool_lamc/db/sql/create_lams_tool_lamc.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/Attic/create_lams_tool_lamc.sql,v diff -u -r1.4 -r1.5 Binary files differ Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Attic/McContent.hbm.xml,v diff -u -r1.3 -r1.4 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml 5 Oct 2005 09:59:03 -0000 1.3 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml 6 Oct 2005 16:01:07 -0000 1.4 @@ -237,7 +237,7 @@ lazy="false" inverse="true" cascade="all-delete-orphan" - sort="natural" + sort="unsorted" > + + Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Attic/McContent.java,v diff -u -r1.4 -r1.5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.java 5 Oct 2005 09:59:03 -0000 1.4 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.java 6 Oct 2005 16:01:07 -0000 1.5 @@ -2,8 +2,9 @@ import java.io.Serializable; import java.util.Date; +import java.util.HashSet; import java.util.Set; -import java.util.SortedSet; + import org.apache.commons.lang.builder.ToStringBuilder; @@ -67,18 +68,7 @@ /** nullable persistent field */ private boolean retries; - /** - * @return Returns the retries. - */ - public boolean isRetries() { - return retries; - } - /** - * @param retries The retries to set. - */ - public void setRetries(boolean retries) { - this.retries = retries; - } + /** nullable persistent field */ private Integer passMark; @@ -89,13 +79,13 @@ private boolean showTopUsers; /** persistent field */ - private SortedSet mcQueContents; + private Set mcQueContents; /** persistent field */ private Set mcSessions; /** full constructor */ - public McContent(Long mcContentId, String title, String instructions, boolean defineLater, boolean runOffline, String creationDate, Date updateDate, boolean questionsSequenced, boolean usernameVisible, String reportTitle, String monitoringReportTitle, long createdBy, boolean synchInMonitor, boolean contentInUse, String offlineInstructions, String onlineInstructions, String endLearningMessage, Integer passMark, boolean showFeedback, boolean retries, boolean showTopUsers, SortedSet mcQueContents, Set mcSessions) { + public McContent(Long mcContentId, String title, String instructions, boolean defineLater, boolean runOffline, String creationDate, Date updateDate, boolean questionsSequenced, boolean usernameVisible, String reportTitle, String monitoringReportTitle, long createdBy, boolean synchInMonitor, boolean contentInUse, String offlineInstructions, String onlineInstructions, String endLearningMessage, Integer passMark, boolean showFeedback, boolean retries, boolean showTopUsers, Set mcQueContents, Set mcSessions) { this.mcContentId = mcContentId; this.title = title; this.instructions = instructions; @@ -126,7 +116,7 @@ } /** minimal constructor */ - public McContent(Long mcContentId, SortedSet mcQueContents, Set mcSessions) { + public McContent(Long mcContentId, Set mcQueContents, Set mcSessions) { this.mcContentId = mcContentId; this.mcQueContents = mcQueContents; this.mcSessions = mcSessions; @@ -300,15 +290,21 @@ this.showTopUsers = showTopUsers; } - public SortedSet getMcQueContents() { + + public Set getMcQueContents() { + if (this.mcQueContents == null) + setMcQueContents(new HashSet()); return this.mcQueContents; } - public void setMcQueContents(SortedSet mcQueContents) { + + public void setMcQueContents(Set mcQueContents) { this.mcQueContents = mcQueContents; } public Set getMcSessions() { + if (this.mcSessions == null) + setMcSessions(new HashSet()); return this.mcSessions; } @@ -321,5 +317,18 @@ .append("uid", getUid()) .toString(); } + + /** + * @return Returns the retries. + */ + public boolean isRetries() { + return retries; + } + /** + * @param retries The retries to set. + */ + public void setRetries(boolean retries) { + this.retries = retries; + } } Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptionsContent.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptionsContent.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Attic/McOptsContent.hbm.xml,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml 6 Oct 2005 16:01:07 -0000 1.1 @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Attic/McOptsContent.java,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.java 6 Oct 2005 16:01:07 -0000 1.1 @@ -0,0 +1,120 @@ +package org.lamsfoundation.lams.tool.mc; + +import java.io.Serializable; +import java.util.HashSet; +import java.util.Set; + +import org.apache.commons.lang.builder.ToStringBuilder; + + +/** @author Hibernate CodeGenerator */ +public class McOptsContent implements Serializable { + + /** identifier field */ + private Long uid; + + private Long mcQueOptionId; + + /** nullable persistent field */ + private boolean correctOption; + + /** nullable persistent field */ + private String mcQueOptionText; + + /** persistent field */ + private org.lamsfoundation.lams.tool.mc.McQueContent mcQueContent; + + /** persistent field */ + private Set mcUsrAttempts; + + + /** full constructor */ + public McOptsContent(Long mcQueOptionId, boolean correctOption, String mcQueOptionText, org.lamsfoundation.lams.tool.mc.McQueContent mcQueContent) { + this.mcQueOptionId=mcQueOptionId; + this.correctOption = correctOption; + this.mcQueOptionText = mcQueOptionText; + this.mcQueContent = mcQueContent; + } + + public McOptsContent(Long mcQueOptionId, boolean correctOption, String mcQueOptionText, org.lamsfoundation.lams.tool.mc.McQueContent mcQueContent, Set mcUsrAttempts) { + this.mcQueOptionId=mcQueOptionId; + this.correctOption = correctOption; + this.mcQueOptionText = mcQueOptionText; + this.mcQueContent = mcQueContent; + this.mcUsrAttempts=mcUsrAttempts; + } + + + /** default constructor */ + public McOptsContent() { + } + + public Long getUid() { + return this.uid; + } + + public void setUid(Long uid) { + this.uid = uid; + } + + + public boolean isCorrectOption() { + return this.correctOption; + } + + public void setCorrectOption(boolean correctOption) { + this.correctOption = correctOption; + } + + public String getMcQueOptionText() { + return this.mcQueOptionText; + } + + public void setMcQueOptionText(String mcQueOptionText) { + this.mcQueOptionText = mcQueOptionText; + } + + public org.lamsfoundation.lams.tool.mc.McQueContent getMcQueContent() { + return this.mcQueContent; + } + + public void setMcQueContent(org.lamsfoundation.lams.tool.mc.McQueContent mcQueContent) { + this.mcQueContent = mcQueContent; + } + + + public String toString() { + return new ToStringBuilder(this) + .append("uid", getUid()) + .toString(); + } + + /** + * @return Returns the mcQueOptionId. + */ + public Long getMcQueOptionId() { + return mcQueOptionId; + } + /** + * @param mcQueOptionId The mcQueOptionId to set. + */ + public void setMcQueOptionId(Long mcQueOptionId) { + this.mcQueOptionId = mcQueOptionId; + } + /** + * @return Returns the mcUsrAttempts. + */ + + + public Set getMcUsrAttempts() { + if (this.mcUsrAttempts == null) + setMcUsrAttempts(new HashSet()); + return this.mcUsrAttempts; + } + /** + * @param mcUsrAttempts The mcUsrAttempts to set. + */ + public void setMcUsrAttempts(Set mcUsrAttempts) { + this.mcUsrAttempts = mcUsrAttempts; + } +} Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Attic/McQueContent.hbm.xml,v diff -u -r1.3 -r1.4 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml 4 Oct 2005 09:47:36 -0000 1.3 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml 6 Oct 2005 16:01:07 -0000 1.4 @@ -4,7 +4,13 @@ "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > + + - - - - - - + + - - - - - - - - - - Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Attic/McQueContent.java,v diff -u -r1.4 -r1.5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java 5 Oct 2005 09:59:03 -0000 1.4 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java 6 Oct 2005 16:01:07 -0000 1.5 @@ -1,6 +1,7 @@ package org.lamsfoundation.lams.tool.mc; import java.io.Serializable; +import java.util.HashSet; import java.util.Set; import org.apache.commons.lang.builder.ToStringBuilder; @@ -23,23 +24,32 @@ /** persistent field */ private org.lamsfoundation.lams.tool.mc.McContent mcContent; - private Long mcContentId; - + /** persistent field */ private Set mcUsrAttempts; /** persistent field */ private Set mcOptionsContents; /** full constructor */ - public McQueContent(Long mcQueContentId, String question, Integer displayOrder, org.lamsfoundation.lams.tool.mc.McContent mcContent, Set mcUsrAttempts, Set mcOptionsContents) { + public McQueContent(Long mcQueContentId, String question, Integer displayOrder, McContent mcContent, Set mcUsrAttempts, Set mcOptionsContents) { this.mcQueContentId = mcQueContentId; this.question = question; this.displayOrder = displayOrder; - this.mcContent = mcContent; + this.mcContent=mcContent; this.mcUsrAttempts = mcUsrAttempts; this.mcOptionsContents = mcOptionsContents; } + + public McQueContent(Long mcQueContentId, String question, Integer displayOrder, Set mcUsrAttempts, Set mcOptionsContents) { + this.mcQueContentId = mcQueContentId; + this.question = question; + this.displayOrder = displayOrder; + this.mcUsrAttempts = mcUsrAttempts; + this.mcOptionsContents = mcOptionsContents; + } + + /** default constructor */ public McQueContent() { @@ -94,14 +104,20 @@ } public Set getMcUsrAttempts() { + if (this.mcUsrAttempts == null) + setMcUsrAttempts(new HashSet()); return this.mcUsrAttempts; } + public void setMcUsrAttempts(Set mcUsrAttempts) { this.mcUsrAttempts = mcUsrAttempts; } + public Set getMcOptionsContents() { + if (this.mcOptionsContents == null) + setMcOptionsContents(new HashSet()); return this.mcOptionsContents; } @@ -114,17 +130,5 @@ .append("uid", getUid()) .toString(); } - - /** - * @return Returns the mcContentId. - */ - public Long getMcContentId() { - return mcContentId; - } - /** - * @param mcContentId The mcContentId to set. - */ - public void setMcContentId(Long mcContentId) { - this.mcContentId = mcContentId; - } + } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Attic/McQueUsr.hbm.xml,v diff -u -r1.2 -r1.3 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml 1 Oct 2005 16:23:48 -0000 1.2 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml 6 Oct 2005 16:01:07 -0000 1.3 @@ -64,12 +64,13 @@ + Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Attic/McQueUsr.java,v diff -u -r1.2 -r1.3 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.java 1 Oct 2005 16:23:48 -0000 1.2 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.java 6 Oct 2005 16:01:07 -0000 1.3 @@ -1,7 +1,9 @@ package org.lamsfoundation.lams.tool.mc; import java.io.Serializable; -import java.util.SortedSet; +import java.util.HashSet; +import java.util.Set; + import org.apache.commons.lang.builder.ToStringBuilder; @@ -27,14 +29,13 @@ private org.lamsfoundation.lams.tool.mc.McSession mcSession; /** persistent field */ - private SortedSet mcUsrAttempts; + private Set mcUsrAttempts; /** full constructor */ - public McQueUsr(Long queUsrId, String username, String fullname, Long mcSessionId, org.lamsfoundation.lams.tool.mc.McSession mcSession, SortedSet mcUsrAttempts) { + public McQueUsr(Long queUsrId, String username, String fullname, org.lamsfoundation.lams.tool.mc.McSession mcSession, Set mcUsrAttempts) { this.queUsrId = queUsrId; this.username = username; this.fullname = fullname; - this.mcSessionId = mcSessionId; this.mcSession = mcSession; this.mcUsrAttempts = mcUsrAttempts; } @@ -44,7 +45,7 @@ } /** minimal constructor */ - public McQueUsr(Long queUsrId, SortedSet mcUsrAttempts) { + public McQueUsr(Long queUsrId, Set mcUsrAttempts) { this.queUsrId = queUsrId; this.mcUsrAttempts = mcUsrAttempts; } @@ -97,11 +98,14 @@ this.mcSession = mcSession; } - public SortedSet getMcUsrAttempts() { + public Set getMcUsrAttempts() { + if (this.mcUsrAttempts == null) + setMcUsrAttempts(new HashSet()); return this.mcUsrAttempts; } - - public void setMcUsrAttempts(SortedSet mcUsrAttempts) { + + + public void setMcUsrAttempts(Set mcUsrAttempts) { this.mcUsrAttempts = mcUsrAttempts; } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Attic/McSession.hbm.xml,v diff -u -r1.1 -r1.2 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml 1 Oct 2005 15:15:16 -0000 1.1 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml 6 Oct 2005 16:01:07 -0000 1.2 @@ -26,7 +26,7 @@ - /WEB-INF/McQueContent.hbm.xml /WEB-INF/McQueUsr.hbm.xml /WEB-INF/McUsrAttempt.hbm.xml - /WEB-INF/McOptionsContent.hbm.xml + /WEB-INF/McOptContent.hbm.xml Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java,v diff -u -r1.2 -r1.3 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java 4 Oct 2005 10:07:03 -0000 1.2 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java 6 Oct 2005 16:01:07 -0000 1.3 @@ -20,8 +20,7 @@ */ package org.lamsfoundation.lams.tool.mc.dao; -import org.lamsfoundation.lams.tool.mc.McOptionsContent; -import org.lamsfoundation.lams.tool.mc.dao.hibernate.McOptionsContentDAO; +import org.lamsfoundation.lams.tool.mc.McOptsContent; /** @@ -31,21 +30,21 @@ */ public interface IMcOptionsContentDAO { - public McOptionsContentDAO getMcOptionsContentByUID(Long uid); + public McOptsContent getMcOptionsContentByUID(Long uid); - public McOptionsContent findMcOptionsContentById(Long mcQueOptionId); + public McOptsContent findMcOptionsContentById(Long mcQueOptionId); - public void saveMcOptionsContent(McOptionsContent mcOptionsContent); + public void saveMcOptionsContent(McOptsContent mcOptionsContent); - public void updateMcOptionsContent(McOptionsContent mcOptionsContent); + public void updateMcOptionsContent(McOptsContent mcOptionsContent); public void removeMcOptionsContentByUID(Long uid); public void removeMcOptionsContent(Long mcQueOptionId); public void removeMcOptionsContentById(Long mcQueOptionId); - public void removeMcOptionsContent(McOptionsContent mcOptionsContent); + public void removeMcOptionsContent(McOptsContent mcOptionsContent); } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java,v diff -u -r1.2 -r1.3 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java 4 Oct 2005 10:07:10 -0000 1.2 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java 6 Oct 2005 16:01:07 -0000 1.3 @@ -11,7 +11,7 @@ import net.sf.hibernate.Hibernate; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.tool.mc.McOptionsContent; +import org.lamsfoundation.lams.tool.mc.McOptsContent; import org.lamsfoundation.lams.tool.mc.dao.IMcOptionsContentDAO; import org.springframework.orm.hibernate.support.HibernateDaoSupport; @@ -26,15 +26,15 @@ public class McOptionsContentDAO extends HibernateDaoSupport implements IMcOptionsContentDAO { static Logger logger = Logger.getLogger(McOptionsContentDAO.class.getName()); - public McOptionsContentDAO getMcOptionsContentByUID(Long uid) + public McOptsContent getMcOptionsContentByUID(Long uid) { - return (McOptionsContentDAO) this.getHibernateTemplate() - .get(McOptionsContentDAO.class, uid); + return (McOptsContent) this.getHibernateTemplate() + .get(McOptsContent.class, uid); } - public McOptionsContent findMcOptionsContentById(Long mcQueOptionId) + public McOptsContent findMcOptionsContentById(Long mcQueOptionId) { - String query = "from McOptionsContent as mco where mco.mcQueOptionId = ?"; + String query = "from McOptsContent as mco where mco.mcQueOptionId = ?"; List content = getHibernateTemplate().find(query,mcQueOptionId); if(content!=null && content.size() == 0) @@ -43,33 +43,33 @@ } else { - return (McOptionsContent)content.get(0); + return (McOptsContent)content.get(0); } } - public void saveMcOptionsContent(McOptionsContent mcOptionsContent) + public void saveMcOptionsContent(McOptsContent mcOptsContent) { - this.getHibernateTemplate().save(mcOptionsContent); + this.getHibernateTemplate().save(mcOptsContent); } - public void updateMcOptionsContent(McOptionsContent mcOptionsContent) + public void updateMcOptionsContent(McOptsContent mcOptsContent) { - this.getHibernateTemplate().update(mcOptionsContent); + this.getHibernateTemplate().update(mcOptsContent); } public void removeMcOptionsContentByUID(Long uid) { - McOptionsContent mco = (McOptionsContent)getHibernateTemplate().get(McOptionsContent.class, uid); + McOptsContent mco = (McOptsContent)getHibernateTemplate().get(McOptsContent.class, uid); this.getHibernateTemplate().delete(mco); } public void removeMcOptionsContent(Long mcQueOptionId) { - String query = "from McOptionsContent as mco where mco.mcQueOptionId="; + String query = "from McOptsContent as mco where mco.mcQueOptionId="; StringBuffer sb = new StringBuffer(query); sb.append(mcQueOptionId.longValue()); String queryString = sb.toString(); @@ -79,15 +79,19 @@ public void removeMcOptionsContentById(Long mcQueOptionId) { - String query = "from mco in class org.lamsfoundation.lams.tool.mc.McOptionsContent" + String query = "from mco in class org.lamsfoundation.lams.tool.mc.McOptsContent" + " where mcq.mcQueOptionId = ?"; this.getHibernateTemplate().delete(query,mcQueOptionId,Hibernate.LONG); } - public void removeMcOptionsContent(McOptionsContent mcOptionsContent) + public void removeMcOptionsContent(McOptsContent mcOptsContent) { - this.getHibernateTemplate().delete(mcOptionsContent); + this.getHibernateTemplate().delete(mcOptsContent); } + public void flush() + { + this.getHibernateTemplate().flush(); + } } \ No newline at end of file Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java,v diff -u -r1.2 -r1.3 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java 4 Oct 2005 09:47:37 -0000 1.2 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java 6 Oct 2005 16:01:07 -0000 1.3 @@ -124,4 +124,9 @@ this.getHibernateTemplate().delete(mcQueContent); } + public void flush() + { + this.getHibernateTemplate().flush(); + } + } \ No newline at end of file Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/Attic/McContent.hbm.xml,v diff -u -r1.2 -r1.3 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml 5 Oct 2005 09:59:03 -0000 1.2 +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml 6 Oct 2005 16:01:07 -0000 1.3 @@ -237,7 +237,7 @@ lazy="false" inverse="true" cascade="all-delete-orphan" - sort="natural" + sort="unsorted" > + + Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/Attic/McDataAccessTestCase.java,v diff -u -r1.3 -r1.4 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java 5 Oct 2005 13:18:52 -0000 1.3 +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java 6 Oct 2005 16:01:07 -0000 1.4 @@ -2,6 +2,7 @@ import org.lamsfoundation.lams.test.AbstractLamsTestCase; import org.lamsfoundation.lams.tool.mc.dao.hibernate.McContentDAO; +import org.lamsfoundation.lams.tool.mc.dao.hibernate.McOptionsContentDAO; import org.lamsfoundation.lams.tool.mc.dao.hibernate.McQueContentDAO; import org.lamsfoundation.lams.tool.mc.dao.hibernate.McSessionDAO; import org.lamsfoundation.lams.tool.mc.dao.hibernate.McUserDAO; @@ -20,7 +21,13 @@ protected final Long TEST_SESSION_ID = new Long(20); protected final Long TEST_SESSION_ID_OTHER = new Long(21); + protected final Long TEST_QUE_ID1 = new Long(1); + protected final Long TEST_QUE_OPTION_ID1 = new Long(1); + protected final Long TEST_QUE_OPTION_ID2 = new Long(2); + protected final Long TEST_QUE_OPTION_ID3 = new Long(3); + protected final Long TEST_NEW_USER_ID = new Long(100); + protected final long ONE_DAY = 60 * 60 * 1000 * 24; public final String NOT_ATTEMPTED = "NOT_ATTEMPTED"; @@ -31,6 +38,7 @@ protected McSessionDAO mcSessionDAO; protected McUserDAO mcUserDAO; protected McQueContentDAO mcQueContentDAO; + protected McOptionsContentDAO mcOptionsContentDAO; protected McUsrAttemptDAO mcUsrAttemptDAO; @@ -50,6 +58,7 @@ mcSessionDAO = (McSessionDAO) this.context.getBean("mcSessionDAO"); mcUserDAO = (McUserDAO) this.context.getBean("mcUserDAO"); mcQueContentDAO = (McQueContentDAO) this.context.getBean("mcQueContentDAO"); + mcOptionsContentDAO =(McOptionsContentDAO) this.context.getBean("mcOptionsContentDAO"); mcUsrAttemptDAO = (McUsrAttemptDAO) this.context.getBean("mcUsrAttemptDAO"); } Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McOptionsContent.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/Attic/McOptsContent.hbm.xml,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml 6 Oct 2005 16:01:07 -0000 1.1 @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/Attic/McQueContent.hbm.xml,v diff -u -r1.2 -r1.3 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml 4 Oct 2005 09:47:37 -0000 1.2 +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml 6 Oct 2005 16:01:07 -0000 1.3 @@ -4,7 +4,13 @@ "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > + + - - - - - - + + - - - - - - - - - - Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/Attic/McQueUsr.hbm.xml,v diff -u -r1.1 -r1.2 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml 3 Oct 2005 12:05:16 -0000 1.1 +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml 6 Oct 2005 16:01:07 -0000 1.2 @@ -64,12 +64,13 @@ + Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/Attic/McSession.hbm.xml,v diff -u -r1.1 -r1.2 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml 3 Oct 2005 12:05:16 -0000 1.1 +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml 6 Oct 2005 16:01:07 -0000 1.2 @@ -26,7 +26,7 @@ - ${jdbc.password} + - /org/lamsfoundation/lams/tool/mc/McContent.hbm.xml - /org/lamsfoundation/lams/tool/mc/McSession.hbm.xml - /org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml - /org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml - /org/lamsfoundation/lams/tool/mc/McOptionsContent.hbm.xml + + /org/lamsfoundation/lams/tool/mc/McContent.hbm.xml + /org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml + /org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml + /org/lamsfoundation/lams/tool/mc/McSession.hbm.xml + /org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml @@ -61,6 +64,8 @@ + +