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.3 -r1.4
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml	6 Oct 2005 16:00:35 -0000	1.3
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml	6 Oct 2005 17:30:22 -0000	1.4
@@ -42,15 +42,6 @@
     >
     </property>
 
-    <property
-        name="mcSessionId"
-        type="java.lang.Long"
-        column="mc_session_id"
-        update="false"
-        insert="false"
-    >
-    </property>
-    
     <many-to-one
         name="mcSession"
         class="org.lamsfoundation.lams.tool.mc.McSession"
@@ -63,8 +54,6 @@
         <column name="mc_session_id" />
     </many-to-one>
 
-
-<!-- 
    	 <set
             name="mcUsrAttempts"
             lazy="false"
@@ -81,7 +70,6 @@
                   class="org.lamsfoundation.lams.tool.mc.McUsrAttempt"
               />
     </set>
-  -->
 
 </class>
 </hibernate-mapping>
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_lamc/db/model/lams_tool_mc.clay
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/db/model/lams_tool_mc.clay,v
diff -u -r1.8 -r1.9
--- lams_tool_lamc/db/model/lams_tool_mc.clay	6 Oct 2005 16:52:40 -0000	1.8
+++ lams_tool_lamc/db/model/lams_tool_mc.clay	6 Oct 2005 17:30:03 -0000	1.9
@@ -413,7 +413,7 @@
 </table>
 <table name="tl_lamc11_que_usr" alias="" remarks="">
 <table-description/>
-<table-figure-bounds x="582" y="87" width="-1" height="-1"/>
+<table-figure-bounds x="555" y="82" width="-1" height="-1"/>
 <column-list>
 <column name="uid" alias="" remarks="" mandatory="true" column-size="20" decimal-digits="0" default-value="" auto-increment="true">
 <column-description/>
@@ -564,6 +564,105 @@
 </foreign-key-list>
 <index-list/>
 </table>
+<table name="tl_lamc11_usr_attempt" alias="" remarks="">
+<table-description/>
+<table-figure-bounds x="889" y="66" width="206" height="118"/>
+<column-list>
+<column name="uid" alias="" remarks="" mandatory="true" column-size="20" decimal-digits="0" default-value="" auto-increment="true">
+<column-description/>
+<data-type name="BIGINT" jdbc-type="-5" selected-variant-pattern="BIGINT(%n)">
+<variant type-name-pattern="BIGINT(%n)" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT"/>
+<variant type-name-pattern="BIGINT(%n) UNSIGNED" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT(%n) ZEROFILL" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT UNSIGNED"/>
+<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="BIGINT ZEROFILL"/>
+</data-type>
+</column>
+<column name="attempt_id" alias="" remarks="" mandatory="true" column-size="20" decimal-digits="0" default-value="" auto-increment="false">
+<column-description/>
+<data-type name="BIGINT" jdbc-type="-5" selected-variant-pattern="BIGINT(%n)">
+<variant type-name-pattern="BIGINT(%n)" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT"/>
+<variant type-name-pattern="BIGINT(%n) UNSIGNED" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT(%n) ZEROFILL" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT UNSIGNED"/>
+<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="BIGINT ZEROFILL"/>
+</data-type>
+</column>
+<column name="que_usr_id" alias="" remarks="" mandatory="true" column-size="20" decimal-digits="0" default-value="" auto-increment="false">
+<column-description/>
+<data-type name="BIGINT" jdbc-type="-5" selected-variant-pattern="BIGINT(%n)">
+<variant type-name-pattern="BIGINT(%n)" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT"/>
+<variant type-name-pattern="BIGINT(%n) UNSIGNED" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT(%n) ZEROFILL" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT UNSIGNED"/>
+<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="BIGINT ZEROFILL"/>
+</data-type>
+</column>
+<column name="mc_que_content_id" alias="" remarks="" mandatory="true" column-size="20" decimal-digits="0" default-value="" auto-increment="false">
+<column-description/>
+<data-type name="BIGINT" jdbc-type="-5" selected-variant-pattern="BIGINT(%n)">
+<variant type-name-pattern="BIGINT(%n)" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT"/>
+<variant type-name-pattern="BIGINT(%n) UNSIGNED" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT(%n) ZEROFILL" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT UNSIGNED"/>
+<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="BIGINT ZEROFILL"/>
+</data-type>
+</column>
+<column name="mc_que_option_id" alias="" remarks="" mandatory="true" column-size="20" decimal-digits="0" default-value="" auto-increment="false">
+<column-description/>
+<data-type name="BIGINT" jdbc-type="-5" selected-variant-pattern="BIGINT(%n)">
+<variant type-name-pattern="BIGINT(%n)" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT"/>
+<variant type-name-pattern="BIGINT(%n) UNSIGNED" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT(%n) ZEROFILL" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT UNSIGNED"/>
+<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="BIGINT ZEROFILL"/>
+</data-type>
+</column>
+<column name="attempt_time" alias="" remarks="" mandatory="false" column-size="0" decimal-digits="0" default-value="" auto-increment="false">
+<column-description/>
+<data-type name="DATETIME" jdbc-type="93" selected-variant-pattern="DATETIME" literal-prefix="'" literal-suffix="'">
+<variant type-name-pattern="DATETIME"/>
+</data-type>
+</column>
+<column name="time_zone" alias="" remarks="" mandatory="false" column-size="255" decimal-digits="0" default-value="" auto-increment="false">
+<column-description/>
+<data-type name="VARCHAR" jdbc-type="12" selected-variant-pattern="VARCHAR(%n)" literal-prefix="'" literal-suffix="'">
+<variant type-name-pattern="VARCHAR(%n)" precision-variable="%n" precision-min="1" precision-max="255"/>
+<variant type-name-pattern="VARCHAR(%n) BINARY" precision-variable="%n" precision-min="1" precision-max="255"/>
+</data-type>
+</column>
+</column-list>
+<primary-key name="PK_TL_LAMC11_USR_ATTEMPT" alias="" remarks="">
+<primary-key-description/>
+<primary-key-column name="uid"/>
+</primary-key>
+<unique-key-list/>
+<foreign-key-list>
+<foreign-key name="FK_tl_lamc11_usr_attempt_1" alias="" remarks="" referenced-table-schema="lams" referenced-table="tl_lamc11_que_usr" referenced-key="PK_TL_LAMC11_QUE_USR" on-update="" on-delete="" source-multiplicity="0..*" target-multiplicity="1" source-entity-role="" target-entity-role="" source-relationship-type="" target-relationship-type="">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="que_usr_id" referenced-key-column-name="uid"/>
+</foreign-key>
+</foreign-key-list>
+<index-list/>
+</table>
 </table-list>
 </schema>
 </schema-list>
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.6 -r1.7
Binary files differ
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.3 -r1.4
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml	6 Oct 2005 16:01:07 -0000	1.3
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml	6 Oct 2005 17:30:03 -0000	1.4
@@ -42,15 +42,6 @@
     >
     </property>
 
-    <property
-        name="mcSessionId"
-        type="java.lang.Long"
-        column="mc_session_id"
-        update="false"
-        insert="false"
-    >
-    </property>
-    
     <many-to-one
         name="mcSession"
         class="org.lamsfoundation.lams.tool.mc.McSession"
@@ -63,8 +54,6 @@
         <column name="mc_session_id" />
     </many-to-one>
 
-
-<!-- 
    	 <set
             name="mcUsrAttempts"
             lazy="false"
@@ -81,7 +70,6 @@
                   class="org.lamsfoundation.lams.tool.mc.McUsrAttempt"
               />
     </set>
-  -->
 
 </class>
 </hibernate-mapping>
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.3 -r1.4
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.java	6 Oct 2005 16:01:07 -0000	1.3
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.java	6 Oct 2005 17:30:03 -0000	1.4
@@ -22,10 +22,8 @@
     /** nullable persistent field */
     private String fullname;
 
+    
     /** nullable persistent field */
-    private Long mcSessionId;
-
-    /** nullable persistent field */
     private org.lamsfoundation.lams.tool.mc.McSession mcSession;
 
     /** persistent field */
@@ -82,14 +80,7 @@
         this.fullname = fullname;
     }
 
-    public Long getMcSessionId() {
-        return this.mcSessionId;
-    }
-
-    public void setMcSessionId(Long mcSessionId) {
-        this.mcSessionId = mcSessionId;
-    }
-
+    
     public org.lamsfoundation.lams.tool.mc.McSession getMcSession() {
         return this.mcSession;
     }
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
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.2 -r1.3
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml	6 Oct 2005 16:01:07 -0000	1.2
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml	6 Oct 2005 17:30:03 -0000	1.3
@@ -42,15 +42,6 @@
     >
     </property>
 
-    <property
-        name="mcSessionId"
-        type="java.lang.Long"
-        column="mc_session_id"
-        update="false"
-        insert="false"
-    >
-    </property>
-    
     <many-to-one
         name="mcSession"
         class="org.lamsfoundation.lams.tool.mc.McSession"
@@ -63,8 +54,6 @@
         <column name="mc_session_id" />
     </many-to-one>
 
-
-<!-- 
    	 <set
             name="mcUsrAttempts"
             lazy="false"
@@ -81,7 +70,6 @@
                   class="org.lamsfoundation.lams.tool.mc.McUsrAttempt"
               />
     </set>
-  -->
 
 </class>
 </hibernate-mapping>
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/Attic/TestMcContent.java,v
diff -u -r1.4 -r1.5
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java	6 Oct 2005 16:52:40 -0000	1.4
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java	6 Oct 2005 17:30:03 -0000	1.5
@@ -44,7 +44,7 @@
         super(name);
     }
     
-  /*
+  
     public void testCreateNewMcContent()
     {
     	//create new mc content
@@ -74,7 +74,7 @@
 	    mcContentDAO.saveMcContent(mc);
 	    assertNotNull(mc);
    }
-   */
+  
     
     
     public void testCreateNewMcContentOther()
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/Attic/TestMcOptionsContent.java,v
diff -u -r1.2 -r1.3
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java	6 Oct 2005 16:52:40 -0000	1.2
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java	6 Oct 2005 17:30:03 -0000	1.3
@@ -38,11 +38,14 @@
     public void testCreateMcOptionsContent()
     {
     	McQueContent mcQueContent = mcQueContentDAO.findMcQueContentById(TEST_QUE_ID1);
-    	McOptsContent mcOptionsContent= new McOptsContent(new Long(777), true, "which", mcQueContent);
+    	McOptsContent mcOptionsContent= new McOptsContent(new Long(777), true, "red", mcQueContent);
     	mcOptionsContentDAO.saveMcOptionsContent(mcOptionsContent);
     	
     	McOptsContent mcOptionsContent2= new McOptsContent(new Long(888), false, "blue", mcQueContent);
     	mcOptionsContentDAO.saveMcOptionsContent(mcOptionsContent2);
+    	
+    	McOptsContent mcOptionsContent3= new McOptsContent(new Long(999), false, "yellow", mcQueContent);
+    	mcOptionsContentDAO.saveMcOptionsContent(mcOptionsContent3);
     } 
     
     	    
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueContent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/Attic/TestMcQueContent.java,v
diff -u -r1.2 -r1.3
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueContent.java	6 Oct 2005 16:52:40 -0000	1.2
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueContent.java	6 Oct 2005 17:30:03 -0000	1.3
@@ -50,6 +50,7 @@
     												);
     	mcQueContentDAO.saveMcQueContent(mcQueContent);
     	
+    
     	
     	McContent mcContent2 = mcContentDAO.findMcContentById(new Long(3));
     	
@@ -62,15 +63,16 @@
     												);
     	mcQueContentDAO.saveMcQueContent(mcQueContent2);
     	
+    	
     }
-    
+   /* 
     public void testRetrieveMcQueContent()
     {
     	McQueContent mcQueContent= mcQueContentDAO.findMcQueContentById(new Long(20));
     	mcQueContent.setDisplayOrder(new Integer(88));
     	mcQueContentDAO.saveMcQueContent(mcQueContent);
     }
-
+    */
     
     
 }
\ No newline at end of file
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/testmcApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/Attic/testmcApplicationContext.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/testmcApplicationContext.xml	6 Oct 2005 16:01:07 -0000	1.3
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/testmcApplicationContext.xml	6 Oct 2005 17:30:03 -0000	1.4
@@ -35,14 +35,12 @@
 		<property name="dataSource"><ref local="dataSource"/></property>
 		<property name="mappingResources">
 			<list>	
-			  <!-- 	
-				<value>/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml</value>
-			  -->
   			  	<value>/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml</value> 
 				<value>/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml</value>
 				<value>/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml</value>
 			  	<value>/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml</value>
 				<value>/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml</value>
+				<value>/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml</value>
 			</list>
 		</property>
 		<property name="hibernateProperties">