Index: lams_tool_laqa/conf/hibernate/mappings/QaContent.hbm.xml
===================================================================
diff -u -r664a5459e87fdfde268c9c54e458618c0965f816 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/conf/hibernate/mappings/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision 664a5459e87fdfde268c9c54e458618c0965f816)
+++ lams_tool_laqa/conf/hibernate/mappings/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -22,8 +22,6 @@
     <property
         name="title"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"
         column="title"
         length="100"
@@ -32,8 +30,6 @@
     <property
         name="instructions"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="instructions"
         length="255"
@@ -43,8 +39,6 @@
    <property
             name="defineLater"
             type="boolean"
-            update="true"
-            insert="true"
             access="property"
             column="define_later"
    />
@@ -53,8 +47,6 @@
    <property
             name="runOffline"
             type="boolean"
-            update="true"
-            insert="true"
             access="property"
             column="run_offline"
    />
@@ -63,8 +55,6 @@
     <property
         name="creationDate"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="creation_date"
         length="10"
@@ -74,8 +64,6 @@
     <property
         name="updateDate"
         type="java.util.Date"
-        update="true"
-        insert="true"
         access="property"        
         column="update_date"
         length="10"
@@ -85,17 +73,13 @@
    <property
             name="questionsSequenced"
             type="boolean"
-            update="true"
-            insert="true"
             access="property"
             column="questions_sequenced"
    />
 
     <property
         name="usernameVisible"
         type="boolean"
-        update="true"
-        insert="true"
         access="property"        
         column="username_visible"
         length="1"
@@ -104,8 +88,6 @@
     <property
         name="reportTitle"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="report_title"
         length="100"
@@ -115,8 +97,6 @@
     <property
         name="monitoringReportTitle"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="monitoring_report_title"
         length="100"
@@ -126,8 +106,6 @@
     <property
         name="createdBy"
         type="long"
-        update="true"
-        insert="true"
         access="property"        
         column="created_by"
         length="20"
@@ -137,8 +115,6 @@
     <property
         name="synchInMonitor"
         type="boolean"
-        update="true"
-        insert="true"
         access="property"        
         column="synch_in_monitor"
         length="1"
@@ -147,8 +123,6 @@
     <property
         name="contentLocked"
         type="boolean"
-        update="true"
-        insert="true"
         access="property"        
         column="content_locked"
         length="1"
@@ -159,8 +133,6 @@
     <property
         name="offlineInstructions"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="offline_instructions"
         length="65535"
@@ -169,8 +141,6 @@
     <property
         name="onlineInstructions"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="online_instructions"
         length="65535"
@@ -179,8 +149,6 @@
     <property
         name="endLearningMessage"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="end_learning_message"
         length="65535"
@@ -189,7 +157,7 @@
 
    	 <set
             name="qaQueContents"
-            lazy="false"
+            lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
             sort="natural"
@@ -206,7 +174,7 @@
 
 	<set
             name="qaSessions"
-            lazy="false"
+            lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
             sort="unsorted"
@@ -224,7 +192,7 @@
     
    	<set
             name="qaUploadedFiles"
-            lazy="false"
+            lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
             sort="unsorted"
Index: lams_tool_laqa/conf/hibernate/mappings/QaQueContent.hbm.xml
===================================================================
diff -u -r664a5459e87fdfde268c9c54e458618c0965f816 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/conf/hibernate/mappings/QaQueContent.hbm.xml	(.../QaQueContent.hbm.xml)	(revision 664a5459e87fdfde268c9c54e458618c0965f816)
+++ lams_tool_laqa/conf/hibernate/mappings/QaQueContent.hbm.xml	(.../QaQueContent.hbm.xml)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -20,8 +20,6 @@
         <property
             name="question"
             type="java.lang.String"
-            update="true"
-            insert="true"
             access="property"
             column="question"
             length="65535"
@@ -30,8 +28,6 @@
         <property
             name="displayOrder"
             type="int"
-            update="true"
-            insert="true"
             access="property"
             column="display_order"
             length="11"
@@ -51,6 +47,7 @@
         <many-to-one
             name="qaContent"
             class="org.lamsfoundation.lams.tool.qa.QaContent"
+            not-null="true"
             cascade="none"
             outer-join="auto"
             update="true"
@@ -64,9 +61,9 @@
 
  		<set
             name="qaUsrResps"
-            lazy="false"
+            lazy="true"
             inverse="true"
-            cascade="none"
+            cascade="all-delete-orphan"
             sort="natural"
         >
               <key
Index: lams_tool_laqa/conf/hibernate/mappings/QaQueUsr.hbm.xml
===================================================================
diff -u -r664a5459e87fdfde268c9c54e458618c0965f816 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/conf/hibernate/mappings/QaQueUsr.hbm.xml	(.../QaQueUsr.hbm.xml)	(revision 664a5459e87fdfde268c9c54e458618c0965f816)
+++ lams_tool_laqa/conf/hibernate/mappings/QaQueUsr.hbm.xml	(.../QaQueUsr.hbm.xml)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -44,6 +44,7 @@
     <many-to-one
         name="qaSession"
         class="org.lamsfoundation.lams.tool.qa.QaSession"
+        not-null="true"
         cascade="none"
         outer-join="auto"
         update="true"
@@ -55,7 +56,7 @@
     
     <set
             name="qaUsrResps"
-            lazy="false"
+            lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
             sort="unsorted"
Index: lams_tool_laqa/conf/hibernate/mappings/QaSession.hbm.xml
===================================================================
diff -u -r664a5459e87fdfde268c9c54e458618c0965f816 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/conf/hibernate/mappings/QaSession.hbm.xml	(.../QaSession.hbm.xml)	(revision 664a5459e87fdfde268c9c54e458618c0965f816)
+++ lams_tool_laqa/conf/hibernate/mappings/QaSession.hbm.xml	(.../QaSession.hbm.xml)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -19,8 +19,6 @@
     <property
         name="session_start_date"
         type="java.util.Date"
-        update="true"
-        insert="true"
         access="property"
         column="session_start_date"
         length="10"
@@ -29,8 +27,6 @@
     <property
         name="session_end_date"
         type="java.util.Date"
-        update="true"
-        insert="true"
         access="property"
         column="session_end_date"
         length="10"
@@ -39,8 +35,6 @@
     <property
         name="session_status"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"
         column="session_status"
         length="100"
@@ -60,6 +54,7 @@
    <many-to-one
         name="qaContent"
         class="org.lamsfoundation.lams.tool.qa.QaContent"
+        not-null="true"        
         cascade="none"
         outer-join="auto"
         update="true"
@@ -73,7 +68,7 @@
     
     <set
         name="qaQueUsers"
-        lazy="false"
+        lazy="true"
         inverse="true"
         cascade="all-delete-orphan"
         sort="unsorted"
Index: lams_tool_laqa/conf/hibernate/mappings/QaUploadedFile.hbm.xml
===================================================================
diff -u -r664a5459e87fdfde268c9c54e458618c0965f816 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/conf/hibernate/mappings/QaUploadedFile.hbm.xml	(.../QaUploadedFile.hbm.xml)	(revision 664a5459e87fdfde268c9c54e458618c0965f816)
+++ lams_tool_laqa/conf/hibernate/mappings/QaUploadedFile.hbm.xml	(.../QaUploadedFile.hbm.xml)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -22,8 +22,6 @@
     <property
         name="uuid"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"
         column="uuid"
         length="255"
@@ -32,17 +30,13 @@
    <property
             name="fileOnline"
             type="boolean"
-            update="true"
-            insert="true"
             access="property"
             column="isOnline_File"
    />
 
    <property
             name="fileName"
             type="java.lang.String"
-            update="true"
-            insert="true"
             access="property"
             column="fileName"
    />
@@ -61,6 +55,7 @@
    <many-to-one
         name="qaContent"
         class="org.lamsfoundation.lams.tool.qa.QaContent"
+        not-null="true"        
         cascade="none"
         outer-join="auto"
         update="true"
Index: lams_tool_laqa/conf/hibernate/mappings/QaUsrResp.hbm.xml
===================================================================
diff -u -r664a5459e87fdfde268c9c54e458618c0965f816 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/conf/hibernate/mappings/QaUsrResp.hbm.xml	(.../QaUsrResp.hbm.xml)	(revision 664a5459e87fdfde268c9c54e458618c0965f816)
+++ lams_tool_laqa/conf/hibernate/mappings/QaUsrResp.hbm.xml	(.../QaUsrResp.hbm.xml)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -28,8 +28,6 @@
     <property
             name="hidden"
             type="boolean"
-            update="true"
-            insert="true"
             access="property"
             column="hidden"
    >
@@ -75,6 +73,7 @@
    <many-to-one
             name="qaQueContent"
             class="org.lamsfoundation.lams.tool.qa.QaQueContent"
+            not-null="true"            
             cascade="none"
             outer-join="auto"
             update="true"
@@ -90,6 +89,7 @@
   <many-to-one
             name="qaQueUser"
             class="org.lamsfoundation.lams.tool.qa.QaQueUsr"
+            not-null="true"            
             cascade="none"
             outer-join="auto"
             update="true"
Index: lams_tool_laqa/db/sql/activity_insert.sql
===================================================================
diff -u -r059d2ef12c421f4c37c47b115d412d460b3207ac -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/db/sql/activity_insert.sql	(.../activity_insert.sql)	(revision 059d2ef12c421f4c37c47b115d412d460b3207ac)
+++ lams_tool_laqa/db/sql/activity_insert.sql	(.../activity_insert.sql)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -43,7 +43,7 @@
 VALUES
 (
 NULL
-, 'Learner completes a series of free text questions.'
+, 'Question and Answer Description'
 , 'Question and Answer'
 , 'Put some help text here.'
 , NULL
Index: lams_tool_laqa/db/sql/tool_insert.sql
===================================================================
diff -u -r63a14a82c79d87539f49f17e2b57e930d8e70bb0 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 63a14a82c79d87539f49f17e2b57e930d8e70bb0)
+++ lams_tool_laqa/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -36,7 +36,7 @@
 'qa',
 '1.1',
 NULL,
-NULL,
+10,
 0,
 1,
 1,
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
===================================================================
diff -u -r664a5459e87fdfde268c9c54e458618c0965f816 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision 664a5459e87fdfde268c9c54e458618c0965f816)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -22,8 +22,6 @@
     <property
         name="title"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"
         column="title"
         length="100"
@@ -32,8 +30,6 @@
     <property
         name="instructions"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="instructions"
         length="255"
@@ -43,8 +39,6 @@
    <property
             name="defineLater"
             type="boolean"
-            update="true"
-            insert="true"
             access="property"
             column="define_later"
    />
@@ -53,8 +47,6 @@
    <property
             name="runOffline"
             type="boolean"
-            update="true"
-            insert="true"
             access="property"
             column="run_offline"
    />
@@ -63,8 +55,6 @@
     <property
         name="creationDate"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="creation_date"
         length="10"
@@ -74,8 +64,6 @@
     <property
         name="updateDate"
         type="java.util.Date"
-        update="true"
-        insert="true"
         access="property"        
         column="update_date"
         length="10"
@@ -85,17 +73,13 @@
    <property
             name="questionsSequenced"
             type="boolean"
-            update="true"
-            insert="true"
             access="property"
             column="questions_sequenced"
    />
 
     <property
         name="usernameVisible"
         type="boolean"
-        update="true"
-        insert="true"
         access="property"        
         column="username_visible"
         length="1"
@@ -104,8 +88,6 @@
     <property
         name="reportTitle"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="report_title"
         length="100"
@@ -115,8 +97,6 @@
     <property
         name="monitoringReportTitle"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="monitoring_report_title"
         length="100"
@@ -126,8 +106,6 @@
     <property
         name="createdBy"
         type="long"
-        update="true"
-        insert="true"
         access="property"        
         column="created_by"
         length="20"
@@ -137,8 +115,6 @@
     <property
         name="synchInMonitor"
         type="boolean"
-        update="true"
-        insert="true"
         access="property"        
         column="synch_in_monitor"
         length="1"
@@ -147,8 +123,6 @@
     <property
         name="contentLocked"
         type="boolean"
-        update="true"
-        insert="true"
         access="property"        
         column="content_locked"
         length="1"
@@ -159,8 +133,6 @@
     <property
         name="offlineInstructions"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="offline_instructions"
         length="65535"
@@ -169,8 +141,6 @@
     <property
         name="onlineInstructions"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="online_instructions"
         length="65535"
@@ -179,8 +149,6 @@
     <property
         name="endLearningMessage"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="end_learning_message"
         length="65535"
@@ -189,7 +157,7 @@
 
    	 <set
             name="qaQueContents"
-            lazy="false"
+            lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
             sort="natural"
@@ -206,7 +174,7 @@
 
 	<set
             name="qaSessions"
-            lazy="false"
+            lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
             sort="unsorted"
@@ -224,7 +192,7 @@
     
    	<set
             name="qaUploadedFiles"
-            lazy="false"
+            lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
             sort="unsorted"
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml
===================================================================
diff -u -r664a5459e87fdfde268c9c54e458618c0965f816 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml	(.../QaQueContent.hbm.xml)	(revision 664a5459e87fdfde268c9c54e458618c0965f816)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml	(.../QaQueContent.hbm.xml)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -20,8 +20,6 @@
         <property
             name="question"
             type="java.lang.String"
-            update="true"
-            insert="true"
             access="property"
             column="question"
             length="65535"
@@ -30,8 +28,6 @@
         <property
             name="displayOrder"
             type="int"
-            update="true"
-            insert="true"
             access="property"
             column="display_order"
             length="11"
@@ -51,6 +47,7 @@
         <many-to-one
             name="qaContent"
             class="org.lamsfoundation.lams.tool.qa.QaContent"
+            not-null="true"
             cascade="none"
             outer-join="auto"
             update="true"
@@ -64,9 +61,9 @@
 
  		<set
             name="qaUsrResps"
-            lazy="false"
+            lazy="true"
             inverse="true"
-            cascade="none"
+            cascade="all-delete-orphan"
             sort="natural"
         >
               <key
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml
===================================================================
diff -u -r664a5459e87fdfde268c9c54e458618c0965f816 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml	(.../QaQueUsr.hbm.xml)	(revision 664a5459e87fdfde268c9c54e458618c0965f816)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml	(.../QaQueUsr.hbm.xml)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -44,6 +44,7 @@
     <many-to-one
         name="qaSession"
         class="org.lamsfoundation.lams.tool.qa.QaSession"
+        not-null="true"
         cascade="none"
         outer-join="auto"
         update="true"
@@ -55,7 +56,7 @@
     
     <set
             name="qaUsrResps"
-            lazy="false"
+            lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
             sort="unsorted"
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml
===================================================================
diff -u -r664a5459e87fdfde268c9c54e458618c0965f816 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml	(.../QaSession.hbm.xml)	(revision 664a5459e87fdfde268c9c54e458618c0965f816)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml	(.../QaSession.hbm.xml)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -19,8 +19,6 @@
     <property
         name="session_start_date"
         type="java.util.Date"
-        update="true"
-        insert="true"
         access="property"
         column="session_start_date"
         length="10"
@@ -29,8 +27,6 @@
     <property
         name="session_end_date"
         type="java.util.Date"
-        update="true"
-        insert="true"
         access="property"
         column="session_end_date"
         length="10"
@@ -39,8 +35,6 @@
     <property
         name="session_status"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"
         column="session_status"
         length="100"
@@ -60,6 +54,7 @@
    <many-to-one
         name="qaContent"
         class="org.lamsfoundation.lams.tool.qa.QaContent"
+        not-null="true"        
         cascade="none"
         outer-join="auto"
         update="true"
@@ -73,7 +68,7 @@
     
     <set
         name="qaQueUsers"
-        lazy="false"
+        lazy="true"
         inverse="true"
         cascade="all-delete-orphan"
         sort="unsorted"
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml
===================================================================
diff -u -r664a5459e87fdfde268c9c54e458618c0965f816 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml	(.../QaUploadedFile.hbm.xml)	(revision 664a5459e87fdfde268c9c54e458618c0965f816)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml	(.../QaUploadedFile.hbm.xml)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -22,8 +22,6 @@
     <property
         name="uuid"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"
         column="uuid"
         length="255"
@@ -32,17 +30,13 @@
    <property
             name="fileOnline"
             type="boolean"
-            update="true"
-            insert="true"
             access="property"
             column="isOnline_File"
    />
 
    <property
             name="fileName"
             type="java.lang.String"
-            update="true"
-            insert="true"
             access="property"
             column="fileName"
    />
@@ -61,6 +55,7 @@
    <many-to-one
         name="qaContent"
         class="org.lamsfoundation.lams.tool.qa.QaContent"
+        not-null="true"        
         cascade="none"
         outer-join="auto"
         update="true"
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml
===================================================================
diff -u -r664a5459e87fdfde268c9c54e458618c0965f816 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml	(.../QaUsrResp.hbm.xml)	(revision 664a5459e87fdfde268c9c54e458618c0965f816)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml	(.../QaUsrResp.hbm.xml)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -28,8 +28,6 @@
     <property
             name="hidden"
             type="boolean"
-            update="true"
-            insert="true"
             access="property"
             column="hidden"
    >
@@ -75,6 +73,7 @@
    <many-to-one
             name="qaQueContent"
             class="org.lamsfoundation.lams.tool.qa.QaQueContent"
+            not-null="true"            
             cascade="none"
             outer-join="auto"
             update="true"
@@ -90,6 +89,7 @@
   <many-to-one
             name="qaQueUser"
             class="org.lamsfoundation.lams.tool.qa.QaQueUsr"
+            not-null="true"            
             cascade="none"
             outer-join="auto"
             update="true"
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
===================================================================
diff -u -r3b5a7ca8b9fe39d0ce74e4403356c817aa4a7f86 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	(.../QaStarterAction.java)	(revision 3b5a7ca8b9fe39d0ce74e4403356c817aa4a7f86)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	(.../QaStarterAction.java)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -143,8 +143,9 @@
 		    logger.debug("retrieving qaService from proxy: " + qaService);
 		    request.getSession().setAttribute(TOOL_SERVICE, qaService);		
 		}
-		/** souble check if this is a good place to call */
-		QaUtils.configureContentRepository(request);
+		/** double check if this is a good place to call */
+		/** needs to be called only once.  */ 
+		/** QaUtils.configureContentRepository(request); */
 		
 	    /**
 	     * obtain and setup the current user's data 
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
===================================================================
diff -u -r664a5459e87fdfde268c9c54e458618c0965f816 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision 664a5459e87fdfde268c9c54e458618c0965f816)
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -22,8 +22,6 @@
     <property
         name="title"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"
         column="title"
         length="100"
@@ -32,8 +30,6 @@
     <property
         name="instructions"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="instructions"
         length="255"
@@ -43,8 +39,6 @@
    <property
             name="defineLater"
             type="boolean"
-            update="true"
-            insert="true"
             access="property"
             column="define_later"
    />
@@ -53,8 +47,6 @@
    <property
             name="runOffline"
             type="boolean"
-            update="true"
-            insert="true"
             access="property"
             column="run_offline"
    />
@@ -63,8 +55,6 @@
     <property
         name="creationDate"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="creation_date"
         length="10"
@@ -74,8 +64,6 @@
     <property
         name="updateDate"
         type="java.util.Date"
-        update="true"
-        insert="true"
         access="property"        
         column="update_date"
         length="10"
@@ -85,17 +73,13 @@
    <property
             name="questionsSequenced"
             type="boolean"
-            update="true"
-            insert="true"
             access="property"
             column="questions_sequenced"
    />
 
     <property
         name="usernameVisible"
         type="boolean"
-        update="true"
-        insert="true"
         access="property"        
         column="username_visible"
         length="1"
@@ -104,8 +88,6 @@
     <property
         name="reportTitle"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="report_title"
         length="100"
@@ -115,8 +97,6 @@
     <property
         name="monitoringReportTitle"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="monitoring_report_title"
         length="100"
@@ -126,8 +106,6 @@
     <property
         name="createdBy"
         type="long"
-        update="true"
-        insert="true"
         access="property"        
         column="created_by"
         length="20"
@@ -137,8 +115,6 @@
     <property
         name="synchInMonitor"
         type="boolean"
-        update="true"
-        insert="true"
         access="property"        
         column="synch_in_monitor"
         length="1"
@@ -147,8 +123,6 @@
     <property
         name="contentLocked"
         type="boolean"
-        update="true"
-        insert="true"
         access="property"        
         column="content_locked"
         length="1"
@@ -159,8 +133,6 @@
     <property
         name="offlineInstructions"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="offline_instructions"
         length="65535"
@@ -169,8 +141,6 @@
     <property
         name="onlineInstructions"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="online_instructions"
         length="65535"
@@ -179,8 +149,6 @@
     <property
         name="endLearningMessage"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="end_learning_message"
         length="65535"
@@ -189,7 +157,7 @@
 
    	 <set
             name="qaQueContents"
-            lazy="false"
+            lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
             sort="natural"
@@ -206,7 +174,7 @@
 
 	<set
             name="qaSessions"
-            lazy="false"
+            lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
             sort="unsorted"
@@ -224,7 +192,7 @@
     
    	<set
             name="qaUploadedFiles"
-            lazy="false"
+            lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
             sort="unsorted"
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java
===================================================================
diff -u -r664a5459e87fdfde268c9c54e458618c0965f816 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java	(.../QaDataAccessTestCase.java)	(revision 664a5459e87fdfde268c9c54e458618c0965f816)
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java	(.../QaDataAccessTestCase.java)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -80,7 +80,7 @@
     	super.tearDown();
     }
     
-    
+    /*
     protected QaQueUsr getExistingUser2(String username, String fullname)
     {
     	QaQueContent qaQueContent = qaQueContentDAO.getQaQueById(TEST_NEW_QUE_CONTENT_ID);
@@ -136,9 +136,38 @@
 		qaUsrRespDAO.createUserResponse(qaUsrResp);
 		return qaUsrResp;
     }
+    */
     
     
+    public void  testInitDB()
+    {
+    	QaContent qa = new QaContent();
+    	qa.setQaContentId(new Long(TEST_NEW_CONTENT_ID+1));
+    	qa.setTitle("New - Put Title Here");
+    	qa.setInstructions("New - Put instructions here.");
+    	qa.setCreationDate(new Date(System.currentTimeMillis()).toString() );
+    	qa.setCreatedBy(0);
+        qa.setUsernameVisible(false);
+        qa.setDefineLater(false);
+        qa.setSynchInMonitor(false);
+        qa.setOnlineInstructions("New- online instructions");
+        qa.setOfflineInstructions("New- offline instructions");
+        qa.setReportTitle("New-Report title");
+        qa.setQaQueContents(new TreeSet());
+        qa.setQaSessions(new TreeSet());
+        
+        //create new qa que content
+        QaQueContent qaQueContent = new QaQueContent("What planet are you from",
+        											4, 
+    												qa, 
+    												new TreeSet(), 
+    												new TreeSet());
+        
+        qa.getQaQueContents().add(qaQueContent);
+        
+        //create the new content
+        qaContentDAO.createQa(qa);
+    }
     
-    
 
 }
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml
===================================================================
diff -u -r664a5459e87fdfde268c9c54e458618c0965f816 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml	(.../QaQueContent.hbm.xml)	(revision 664a5459e87fdfde268c9c54e458618c0965f816)
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml	(.../QaQueContent.hbm.xml)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -20,8 +20,6 @@
         <property
             name="question"
             type="java.lang.String"
-            update="true"
-            insert="true"
             access="property"
             column="question"
             length="65535"
@@ -30,8 +28,6 @@
         <property
             name="displayOrder"
             type="int"
-            update="true"
-            insert="true"
             access="property"
             column="display_order"
             length="11"
@@ -51,6 +47,7 @@
         <many-to-one
             name="qaContent"
             class="org.lamsfoundation.lams.tool.qa.QaContent"
+            not-null="true"
             cascade="none"
             outer-join="auto"
             update="true"
@@ -64,9 +61,9 @@
 
  		<set
             name="qaUsrResps"
-            lazy="false"
+            lazy="true"
             inverse="true"
-            cascade="none"
+            cascade="all-delete-orphan"
             sort="natural"
         >
               <key
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml
===================================================================
diff -u -r664a5459e87fdfde268c9c54e458618c0965f816 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml	(.../QaQueUsr.hbm.xml)	(revision 664a5459e87fdfde268c9c54e458618c0965f816)
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml	(.../QaQueUsr.hbm.xml)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -44,6 +44,7 @@
     <many-to-one
         name="qaSession"
         class="org.lamsfoundation.lams.tool.qa.QaSession"
+        not-null="true"
         cascade="none"
         outer-join="auto"
         update="true"
@@ -55,7 +56,7 @@
     
     <set
             name="qaUsrResps"
-            lazy="false"
+            lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
             sort="unsorted"
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml
===================================================================
diff -u -r664a5459e87fdfde268c9c54e458618c0965f816 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml	(.../QaSession.hbm.xml)	(revision 664a5459e87fdfde268c9c54e458618c0965f816)
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaSession.hbm.xml	(.../QaSession.hbm.xml)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -19,8 +19,6 @@
     <property
         name="session_start_date"
         type="java.util.Date"
-        update="true"
-        insert="true"
         access="property"
         column="session_start_date"
         length="10"
@@ -29,8 +27,6 @@
     <property
         name="session_end_date"
         type="java.util.Date"
-        update="true"
-        insert="true"
         access="property"
         column="session_end_date"
         length="10"
@@ -39,8 +35,6 @@
     <property
         name="session_status"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"
         column="session_status"
         length="100"
@@ -60,6 +54,7 @@
    <many-to-one
         name="qaContent"
         class="org.lamsfoundation.lams.tool.qa.QaContent"
+        not-null="true"        
         cascade="none"
         outer-join="auto"
         update="true"
@@ -73,7 +68,7 @@
     
     <set
         name="qaQueUsers"
-        lazy="false"
+        lazy="true"
         inverse="true"
         cascade="all-delete-orphan"
         sort="unsorted"
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml
===================================================================
diff -u -r664a5459e87fdfde268c9c54e458618c0965f816 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml	(.../QaUploadedFile.hbm.xml)	(revision 664a5459e87fdfde268c9c54e458618c0965f816)
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.hbm.xml	(.../QaUploadedFile.hbm.xml)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -22,8 +22,6 @@
     <property
         name="uuid"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"
         column="uuid"
         length="255"
@@ -32,17 +30,13 @@
    <property
             name="fileOnline"
             type="boolean"
-            update="true"
-            insert="true"
             access="property"
             column="isOnline_File"
    />
 
    <property
             name="fileName"
             type="java.lang.String"
-            update="true"
-            insert="true"
             access="property"
             column="fileName"
    />
@@ -61,6 +55,7 @@
    <many-to-one
         name="qaContent"
         class="org.lamsfoundation.lams.tool.qa.QaContent"
+        not-null="true"        
         cascade="none"
         outer-join="auto"
         update="true"
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml
===================================================================
diff -u -r664a5459e87fdfde268c9c54e458618c0965f816 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml	(.../QaUsrResp.hbm.xml)	(revision 664a5459e87fdfde268c9c54e458618c0965f816)
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml	(.../QaUsrResp.hbm.xml)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -28,8 +28,6 @@
     <property
             name="hidden"
             type="boolean"
-            update="true"
-            insert="true"
             access="property"
             column="hidden"
    >
@@ -75,6 +73,7 @@
    <many-to-one
             name="qaQueContent"
             class="org.lamsfoundation.lams.tool.qa.QaQueContent"
+            not-null="true"            
             cascade="none"
             outer-join="auto"
             update="true"
@@ -90,6 +89,7 @@
   <many-to-one
             name="qaQueUser"
             class="org.lamsfoundation.lams.tool.qa.QaQueUsr"
+            not-null="true"            
             cascade="none"
             outer-join="auto"
             update="true"
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java
===================================================================
diff -u -r9d6dababf4dd2550d08b30ec6e4235779fe466c6 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java	(.../TestQaContent.java)	(revision 9d6dababf4dd2550d08b30ec6e4235779fe466c6)
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java	(.../TestQaContent.java)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -50,7 +50,7 @@
         super(name);
     }
     
-    
+/*    
     public void testSimpleCreateNewQaContent()
     {
     	//create new qa content
@@ -81,9 +81,8 @@
 	    //create the new content
 	    qaContentDAO.createQa(qa);
     }
+  */  
     
-    
-    
    /* 
     public void testCreateNewQaContent()
     {
@@ -203,7 +202,7 @@
     	System.out.println(this.getClass().getName() + "qaContent loaded : " + qaContent);
     }
     */
-    
+/*    
     public void testTimeZone()
     {
     	TimeZone timeZone=TimeZone.getDefault();
@@ -216,5 +215,6 @@
     	 System.out.println("10. " + DateFormat.getDateTimeInstance(
          DateFormat.LONG, DateFormat.LONG).format(now));	
     }
+*/    
     
 }
\ No newline at end of file
Index: lams_tool_laqa/test/web/WEB-INF/web.xml
===================================================================
diff -u -r664a5459e87fdfde268c9c54e458618c0965f816 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 664a5459e87fdfde268c9c54e458618c0965f816)
+++ lams_tool_laqa/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -48,7 +48,7 @@
    </filter-mapping>	
    
    <!--  Servlet defination -->
-	<servlet>
+<!-- 	<servlet>
 		<servlet-name>exportPortfolio</servlet-name>
 		<display-name>Export Portfolio</display-name>
 		<description>Export Portfolio</description>		
@@ -58,7 +58,7 @@
 	<servlet-mapping>
 		<servlet-name>exportPortfolio</servlet-name>
 		<url-pattern>/portfolioExport</url-pattern>
-  	</servlet-mapping>
+  	</servlet-mapping> -->
 
     <!--
     To use non XDoclet filters, create a filters.xml file that
Index: lams_tool_laqa/web/WEB-INF/web.xml
===================================================================
diff -u -r6e88819a5d24d1ab3458650bc57c90204e774867 -r33127f690e04777acb08682f48994e5c102e4967
--- lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision 6e88819a5d24d1ab3458650bc57c90204e774867)
+++ lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision 33127f690e04777acb08682f48994e5c102e4967)
@@ -18,22 +18,24 @@
 			classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
 		</param-value>
 	</context-param>
-	
+
 	<listener>
 		<listener-class>
 			org.springframework.web.context.ContextLoaderListener
 		</listener-class>
 	</listener>	
-<!-- 	
-	<filter>
-    <filter-name>contentFilter</filter-name>
-    <filter-class>org.lamsfoundation.lams.web.filter.ResponseCaptureFilter</filter-class>
-	</filter>
 
-	<filter-mapping>
-	    <filter-name>contentFilter</filter-name>
-	    <url-pattern>/portfolioExport</url-pattern>
-	</filter-mapping> -->
+
+    <filter>
+    <filter-name>hibernateFilter</filter-name>
+    <filter-class>
+      org.springframework.orm.hibernate3.support.OpenSessionInViewFilter
+    </filter-class>
+    <init-param>
+      <param-name>sessionFactoryBeanName</param-name>
+      <param-value>qaSessionFactory</param-value>
+    </init-param>
+   </filter>
    <!-- System session filter -->
    <filter>
        <filter-name>SystemSessionFilter</filter-name>
@@ -43,56 +45,16 @@
      </filter>
 
     <filter-mapping>
- 	   <filter-name>SystemSessionFilter</filter-name>
-    	 <url-pattern>/*</url-pattern>
-   </filter-mapping>	
-   
-   <!--  Servlet defination -->
-<!-- 	<servlet>
-		<servlet-name>exportPortfolio</servlet-name>
-		<display-name>Export Portfolio</display-name>
-		<description>Export Portfolio</description>		
-		<servlet-class>org.lamsfoundation.lams.tool.qa.web.QaExportServlet</servlet-class>
-	</servlet>
-	
-	<servlet-mapping>
-		<servlet-name>exportPortfolio</servlet-name>
-		<url-pattern>/portfolioExport</url-pattern>
-  	</servlet-mapping> -->
+    <filter-name>hibernateFilter</filter-name>
+     <url-pattern>*.do</url-pattern>
+  </filter-mapping>
+    <filter-mapping>
+    <filter-name>SystemSessionFilter</filter-name>
+     <url-pattern>/*</url-pattern>
+  </filter-mapping>
 
-    <!--
-    To use non XDoclet filters, create a filters.xml file that
-    contains the additional filters (eg Sitemesh) and place it in your
-    project's merge dir.  Don't include filter-mappings in this file,
-    include them in a file called filter-mappings.xml and put that in
-    the same directory.
-    -->
 
-    <!--
-    To use non XDoclet filter-mappings, create a filter-mappings.xml file that
-    contains the additional filter-mappings and place it in your
-    project's merge dir.
-    -->
 
-    <!--
-    To use non XDoclet listeners, create a listeners.xml file that
-    contains the additional listeners and place it in your
-    project's merge dir.
-    -->
-
-     	<!--
-	  - Loads the root application context of this web app at startup,
-	  - by default from "/WEB-INF/applicationContext.xml".
-		- Note that it is preferable to use ContextLoaderListener in a servlet container
-		- that follows the Servlet 2.4 initialization order (most Servlet 2.3 containers do).
-		-
-	  - Use WebApplicationContextUtils.getWebApplicationContext(servletContext)
-	  - to access it anywhere in the web application, outside of the framework.
-	  -
-	  - The root context is the parent of all servlet-specific contexts.
-	  - This means that its beans are automatically available in these child contexts,
-	  - both for getBean(name) calls and (external) bean references.
-		-->
 	<servlet>
 		<servlet-name>context</servlet-name>
 		<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>