Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcContentDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcContentDAO.java,v
diff -u -r1.7 -r1.8
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcContentDAO.java	24 Dec 2005 18:53:58 -0000	1.7
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcContentDAO.java	7 Jan 2006 14:10:33 -0000	1.8
@@ -24,8 +24,8 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.tool.mc.McContent;
-import org.lamsfoundation.lams.tool.mc.McSession;
+import org.lamsfoundation.lams.tool.mc.pojos.McContent;
+import org.lamsfoundation.lams.tool.mc.pojos.McSession;
 
 /**
  * @author Ozgur Demirtas
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.12 -r1.13
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java	17 Nov 2005 14:51:28 -0000	1.12
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java	7 Jan 2006 14:10:33 -0000	1.13
@@ -24,7 +24,7 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.tool.mc.McOptsContent;
+import org.lamsfoundation.lams.tool.mc.pojos.McOptsContent;
 
 /**
  * @author Ozgur Demirtas
@@ -102,6 +102,8 @@
 	 * @param mcOptionsContent
 	 */
 	public void removeMcOptionsContent(McOptsContent mcOptsContent);
+	
+	public List findMcOptionNamesByQueId(Long mcQueContentId);
 }
 
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java,v
diff -u -r1.16 -r1.17
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java	25 Nov 2005 12:02:19 -0000	1.16
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java	7 Jan 2006 14:10:33 -0000	1.17
@@ -24,7 +24,7 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.tool.mc.McQueContent;
+import org.lamsfoundation.lams.tool.mc.pojos.McQueContent;
 
 
 /**
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcSessionDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcSessionDAO.java,v
diff -u -r1.6 -r1.7
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcSessionDAO.java	22 Nov 2005 20:38:06 -0000	1.6
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcSessionDAO.java	7 Jan 2006 14:10:33 -0000	1.7
@@ -24,10 +24,9 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.tool.mc.McContent;
-import org.lamsfoundation.lams.tool.mc.McQueUsr;
-import org.lamsfoundation.lams.tool.mc.McSession;
-import org.springframework.orm.hibernate3.HibernateTemplate;
+import org.lamsfoundation.lams.tool.mc.pojos.McContent;
+import org.lamsfoundation.lams.tool.mc.pojos.McQueUsr;
+import org.lamsfoundation.lams.tool.mc.pojos.McSession;
 
 
 /**
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUploadedFileDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/Attic/IMcUploadedFileDAO.java,v
diff -u -r1.8 -r1.9
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUploadedFileDAO.java	10 Dec 2005 21:53:05 -0000	1.8
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUploadedFileDAO.java	7 Jan 2006 14:10:33 -0000	1.9
@@ -22,7 +22,7 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.tool.mc.McUploadedFile;
+import org.lamsfoundation.lams.tool.mc.pojos.McUploadedFile;
 
 /**
  * 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java,v
diff -u -r1.7 -r1.8
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java	13 Nov 2005 13:20:24 -0000	1.7
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java	7 Jan 2006 14:10:33 -0000	1.8
@@ -23,9 +23,11 @@
 
 package org.lamsfoundation.lams.tool.mc.dao;
 
-import org.lamsfoundation.lams.tool.mc.McQueUsr; 
-import org.lamsfoundation.lams.tool.mc.McSession;
+import java.util.List;
 
+import org.lamsfoundation.lams.tool.mc.pojos.McQueUsr;
+import org.lamsfoundation.lams.tool.mc.pojos.McSession;
+
 /**
  * @author Ozgur Demirtas
  * <p>Interface for the McUser DAO, defines methods needed to access/modify user data</p>
@@ -85,5 +87,7 @@
      * @return the number of users that are in this session
      */
     public int getNumberOfUsers(McSession mcSession);
+    
+    public List getMcUserBySessionOnly(final McSession mcSession);
    
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java,v
diff -u -r1.9 -r1.10
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java	22 Nov 2005 20:38:06 -0000	1.9
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java	7 Jan 2006 14:10:33 -0000	1.10
@@ -24,7 +24,7 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.tool.mc.McUsrAttempt;
+import org.lamsfoundation.lams.tool.mc.pojos.McUsrAttempt;
 
 
 /**
@@ -124,6 +124,9 @@
 	 * 
 	 * @return 
 	 */
+	
+	public List getAttemptsForUser(final Long queUsrId);
+	
 	public List getMarks();
 }