Index: lams_tool_lamc/conf/hibernate/mappings/McContent.hbm.xml
===================================================================
diff -u -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 -r44ebdc79af2b77d9f5ae22774c552279633f866a
--- lams_tool_lamc/conf/hibernate/mappings/McContent.hbm.xml	(.../McContent.hbm.xml)	(revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9)
+++ lams_tool_lamc/conf/hibernate/mappings/McContent.hbm.xml	(.../McContent.hbm.xml)	(revision 44ebdc79af2b77d9f5ae22774c552279633f866a)
@@ -192,6 +192,16 @@
     />
     
     <property
+        name="retries"
+        type="boolean"
+        update="true"
+        insert="true"
+        access="property"        
+        column="retries"
+        length="1"
+    />
+    
+    <property
         name="passMark"
         type="java.lang.Integer"
         update="true"
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml
===================================================================
diff -u -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 -r44ebdc79af2b77d9f5ae22774c552279633f866a
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml	(.../McContent.hbm.xml)	(revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml	(.../McContent.hbm.xml)	(revision 44ebdc79af2b77d9f5ae22774c552279633f866a)
@@ -192,6 +192,16 @@
     />
     
     <property
+        name="retries"
+        type="boolean"
+        update="true"
+        insert="true"
+        access="property"        
+        column="retries"
+        length="1"
+    />
+    
+    <property
         name="passMark"
         type="java.lang.Integer"
         update="true"
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.java
===================================================================
diff -u -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 -r44ebdc79af2b77d9f5ae22774c552279633f866a
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.java	(.../McContent.java)	(revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.java	(.../McContent.java)	(revision 44ebdc79af2b77d9f5ae22774c552279633f866a)
@@ -65,6 +65,21 @@
     private String endLearningMessage;
 
     /** 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;
 
     /** nullable persistent field */
@@ -80,7 +95,7 @@
     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 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, SortedSet mcQueContents, Set mcSessions) {
         this.mcContentId = mcContentId;
         this.title = title;
         this.instructions = instructions;
@@ -99,6 +114,7 @@
         this.onlineInstructions = onlineInstructions;
         this.endLearningMessage = endLearningMessage;
         this.passMark = passMark;
+        this.retries=retries;
         this.showFeedback = showFeedback;
         this.showTopUsers = showTopUsers;
         this.mcQueContents = mcQueContents;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java
===================================================================
diff -u -ra4a6e7505e6a9de8913dd1fe62a678d3c00dbf56 -r44ebdc79af2b77d9f5ae22774c552279633f866a
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java	(.../McQueContent.java)	(revision a4a6e7505e6a9de8913dd1fe62a678d3c00dbf56)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java	(.../McQueContent.java)	(revision 44ebdc79af2b77d9f5ae22774c552279633f866a)
@@ -61,11 +61,11 @@
         this.uid = uid;
     }
 
-    public Long getQaQueContentId() {
+    public Long getMcQueContentId() {
         return this.mcQueContentId;
     }
 
-    public void setQaQueContentId(Long mcQueContentId) {
+    public void setMcQueContentId(Long mcQueContentId) {
         this.mcQueContentId = mcQueContentId;
     }
 
@@ -115,4 +115,16 @@
             .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/test/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml
===================================================================
diff -u -rfdfde70a60685ba9b6aff901a9792542afd45fbb -r44ebdc79af2b77d9f5ae22774c552279633f866a
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml	(.../McContent.hbm.xml)	(revision fdfde70a60685ba9b6aff901a9792542afd45fbb)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml	(.../McContent.hbm.xml)	(revision 44ebdc79af2b77d9f5ae22774c552279633f866a)
@@ -192,6 +192,16 @@
     />
     
     <property
+        name="retries"
+        type="boolean"
+        update="true"
+        insert="true"
+        access="property"        
+        column="retries"
+        length="1"
+    />
+    
+    <property
         name="passMark"
         type="java.lang.Integer"
         update="true"
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java
===================================================================
diff -u -r899f826e2aff2a1a624a0c4a212a284660fe4a60 -r44ebdc79af2b77d9f5ae22774c552279633f866a
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java	(.../TestMcContent.java)	(revision 899f826e2aff2a1a624a0c4a212a284660fe4a60)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java	(.../TestMcContent.java)	(revision 44ebdc79af2b77d9f5ae22774c552279633f866a)
@@ -9,9 +9,7 @@
 
 package org.lamsfoundation.lams.tool.mc;
 
-import java.text.DateFormat;
-import java.util.Date;
-import java.util.TimeZone;
+import java.util.TreeSet;
 
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
 
@@ -46,137 +44,34 @@
         super(name);
     }
     
-   /* 
-    public void testCreateNewQaContent()
+  
+    public void testCreateNewMcContent()
     {
     	//create new mc content
-    	QaContent mc = new QaContent();
-		mc.setQaContentId(new Long(TEST_NEW_CONTENT_ID));
+    	McContent mc = new McContent();
+		mc.setMcContentId(new Long(4));
 		mc.setTitle("New - Put Title Here");
 		mc.setInstructions("New - Put instructions here.");
-		mc.setCreationDate(new Date(System.currentTimeMillis()));
+		mc.setQuestionsSequenced(false);
+		mc.setUsernameVisible(false);
 		mc.setCreatedBy(0);
-	    mc.setUsernameVisible(false);
+		mc.setMonitoringReportTitle("New-Monitoring Report title");
+		mc.setReportTitle("New-Report title");
+		mc.setRunOffline(false);
 	    mc.setDefineLater(false);
 	    mc.setSynchInMonitor(false);
 	    mc.setOnlineInstructions("New- online instructions");
 	    mc.setOfflineInstructions("New- offline instructions");
-	    mc.setReportTitle("New-Report title");
-	    mc.setQaQueContents(new TreeSet());
-	    mc.setQaSessions(new TreeSet());
+	    mc.setEndLearningMessage("New- endLearningMessage");
+	    mc.setContentInUse(false);
+	    mc.setRetries(false);
+	    mc.setShowFeedback(false);
+	    mc.setShowTopUsers(false);
+		
+	    mc.setMcQueContents(new TreeSet());
+	    mc.setMcSessions(new TreeSet());
 	    
-	    //create new mc que content
-	    QaQueContent mcQueContent = new QaQueContent("What planet are you from",
-	    											4, 
-													mc, 
-													new TreeSet(), 
-													new TreeSet());
-	    
-	    mc.getQaQueContents().add(mcQueContent);
-	    
-	    //create the new content
-	    mcContentDAO.createQa(mc);
-	    
-	    
-        mcSession = new QaSession(new Long(TEST_NEW_SESSION_ID),
-                new Date(System.currentTimeMillis()),
-                new Date(System.currentTimeMillis()+ ONE_DAY),
-                this.NOT_ATTEMPTED, 
-				mc,
-                new TreeSet());
-        
-        mcSession.setQaContent(mc);
-        
-        //create new mc que response
-        mcQueContent.getQaUsrResps().add(getNewResponse("I am from Venus", mcQueContent));
-        
-	    //create a new session with the  new content
-        mcSessionDAO.CreateQaSession(mcSession);
-        System.out.println(this.getClass().getName() + " New session created: " + mc);
+	    mcContentDAO.saveMcContent(mc);
    }
-   */
     
-    
-/*
-
-    public void testCreateDefaultQaContent()
-    {
-    	QaContent defaultQaContent = mcContentDAO.getQaById(DEFAULT_CONTENT_ID);	
-    	System.out.println(this.getClass().getName() + " Default mc content: " + defaultQaContent.getQaQueContents());
-    	Iterator queIterator=defaultQaContent.getQaQueContents().iterator();
-    	System.out.println(this.getClass().getName() + " \nqueIterator: " + queIterator);
-    	while (queIterator.hasNext())
-    	{
-    		System.out.println(this.getClass().getName() + " \nin loop");
-    		QaQueContent mcQueContent=(QaQueContent) queIterator.next();
-    		System.out.println(this.getClass().getName() + " \nquestion: " + mcQueContent.getQuestion());
-    	}
-    }
-
-*/   
-    
-    
-  /*  
-    public void testCreateExistingQaContent()
-    {
-    	QaContent defaultQaContent = mcContentDAO.getQaById(242453535L);
-    	if (defaultQaContent == null)
-		{
-    		System.out.println(this.getClass().getName() + " Default mc content: " + defaultQaContent);
-		}
-    	else
-    	{
-    		System.out.println(this.getClass().getName() + " other content: ");
-    	}
-    }
-  */
-    
-    
-    /*
-    public void testIdGeneration()
-    {
-    	System.out.println(this.getClass().getName() + " generated id: " + QaUtils.generateId());
-    }
-    */
-    
-    /*
-    public void testRemoveNewQaContent()
-    {
-    	mcContentDAO.removeQa(new Long(TEST_NEW_CONTENT_ID));   
-        System.out.println("New content removed: ");
-    }
-    */
-
-    /*
-    public void testRemoveQaContent()
-    {
-    //	mcQueContentDAO.removeQueContent(TEST_EXISTING_QUE_CONTENT_ID);
-    //	System.out.println(this.getClass().getName() + " TEST_EXISTING_QUE_CONTENT_ID removed");
-    	
-    	mcContentDAO.removeQa(new Long(DEFAULT_CONTENT_ID));
-    	System.out.println(this.getClass().getName() + " DEFAULT_CONTENT_ID removed");
-    }
-    */
- 
-    /*
-    public void testRemoveQaContent()
-    {
-    	QaContent mcContent = mcContentDAO.loadQaById(TEST_NONEXISTING_CONTENT_ID);
-    	System.out.println(this.getClass().getName() + "mcContent loaded : " + mcContent);
-    }
-    */
-    
-    public void testTimeZone()
-    {
-    	TimeZone timeZone=TimeZone.getDefault();
-    	System.out.println("timeZone: " + timeZone.getDisplayName());
-    }
-    
-    public void testDateTime()
-    {
-    	 Date now = new Date();
-    	 System.out.println("10. " + DateFormat.getDateTimeInstance(
-         DateFormat.LONG, DateFormat.LONG).format(now));	
-    }
-    
 }
\ No newline at end of file
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/testmcApplicationContext.xml
===================================================================
diff -u -r899f826e2aff2a1a624a0c4a212a284660fe4a60 -r44ebdc79af2b77d9f5ae22774c552279633f866a
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/testmcApplicationContext.xml	(.../testmcApplicationContext.xml)	(revision 899f826e2aff2a1a624a0c4a212a284660fe4a60)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/testmcApplicationContext.xml	(.../testmcApplicationContext.xml)	(revision 44ebdc79af2b77d9f5ae22774c552279633f866a)
@@ -58,7 +58,7 @@
 	<!-- bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager"/-->
 	<!-- Transaction manager for a single Hibernate SessionFactory (alternative to JTA) -->
 	<bean id="transactionManager" class="org.springframework.orm.hibernate.HibernateTransactionManager">
-		<property name="mcSessionFactory"><ref local="mcSessionFactory"/></property>
+		<property name="sessionFactory"><ref local="mcSessionFactory"/></property>
 	</bean>
 
 	
@@ -67,34 +67,34 @@
 	<!-- tool beans -->
 
 	<bean id="mcContentDAO" class="org.lamsfoundation.lams.tool.mc.dao.hibernate.McContentDAO">
-		<property name="mcsessionFactory"><ref local="mcSessionFactory"/></property>
+		<property name="sessionFactory"><ref local="mcSessionFactory"/></property>
 	</bean>  
 
 	<bean id="mcSessionDAO" class="org.lamsfoundation.lams.tool.mc.dao.hibernate.McSessionDAO">
-		<property name="mcsessionFactory"><ref local="mcSessionFactory"/></property>
+		<property name="sessionFactory"><ref local="mcSessionFactory"/></property>
 	</bean>
 
 	<bean id="mcUserDAO" class="org.lamsfoundation.lams.tool.mc.dao.hibernate.McUserDAO">
-		<property name="mcsessionFactory"><ref local="mcSessionFactory"/></property>
+		<property name="sessionFactory"><ref local="mcSessionFactory"/></property>
 	</bean>
 	
 	<bean id="mcQueContentDAO" class="org.lamsfoundation.lams.tool.mc.dao.hibernate.McQueContentDAO">
-		<property name="mcsessionFactory"><ref local="mcSessionFactory"/></property>
+		<property name="sessionFactory"><ref local="mcSessionFactory"/></property>
 	</bean>
 	
 	<bean id="mcOptionsContentDAO" class="org.lamsfoundation.lams.tool.mc.dao.hibernate.McOptionsContentDAO">
-		<property name="mcsessionFactory"><ref local="mcSessionFactory"/></property>
+		<property name="sessionFactory"><ref local="mcSessionFactory"/></property>
 	</bean>
 	
 	
 	<bean id="mcUsrAttemptDAO" class="org.lamsfoundation.lams.tool.mc.dao.hibernate.McUsrAttemptDAO">
-		<property name="mcsessionFactory"><ref local="mcSessionFactory"/></property>
+		<property name="sessionFactory"><ref local="mcSessionFactory"/></property>
 	</bean>
 	
 
 <!-- 	
 	<bean id="mcUploadedFileDAO" class="org.lamsfoundation.lams.tool.mc.dao.hibernate.McUploadedFileDAO">
-		<property name="mcsessionFactory"><ref local="mcSessionFactory"/></property>
+		<property name="sessionFactory"><ref local="mcSessionFactory"/></property>
 	</bean>
 -->