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.8 -r1.9
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml	11 Oct 2005 11:35:27 -0000	1.8
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml	14 Oct 2005 15:50:10 -0000	1.9
@@ -29,8 +29,6 @@
     <property
         name="title"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"
         column="title"
         length="100"
@@ -39,8 +37,6 @@
     <property
         name="instructions"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="instructions"
         length="255"
@@ -50,18 +46,13 @@
    <property
             name="defineLater"
             type="boolean"
-            update="true"
-            insert="true"
             access="property"
             column="define_later"
    />
 
-
    <property
             name="runOffline"
             type="boolean"
-            update="true"
-            insert="true"
             access="property"
             column="run_offline"
    />
@@ -70,8 +61,6 @@
     <property
         name="creationDate"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="creation_date"
         length="10"
@@ -81,8 +70,6 @@
     <property
         name="updateDate"
         type="java.util.Date"
-        update="true"
-        insert="true"
         access="property"        
         column="update_date"
         length="20"
@@ -92,17 +79,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"
@@ -111,41 +94,30 @@
     <property
         name="reportTitle"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="report_title"
         length="100"
     />
     
-
     <property
         name="monitoringReportTitle"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="monitoring_report_title"
         length="100"
     />
  
- 
     <property
         name="createdBy"
         type="long"
-        update="true"
-        insert="true"
         access="property"        
         column="created_by"
         length="20"
     />
 
-
     <property
         name="synchInMonitor"
         type="boolean"
-        update="true"
-        insert="true"
         access="property"        
         column="synch_in_monitor"
         length="1"
@@ -154,8 +126,6 @@
     <property
         name="contentInUse"
         type="boolean"
-        update="true"
-        insert="true"
         access="property"        
         column="content_in_use"
         length="1"
@@ -164,8 +134,6 @@
     <property
         name="offlineInstructions"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="offline_instructions"
         length="65535"
@@ -174,8 +142,6 @@
     <property
         name="onlineInstructions"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="online_instructions"
         length="65535"
@@ -184,8 +150,6 @@
     <property
         name="endLearningMessage"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="end_learning_message"
         length="65535"
@@ -194,8 +158,6 @@
     <property
         name="retries"
         type="boolean"
-        update="true"
-        insert="true"
         access="property"        
         column="retries"
         length="1"
@@ -204,25 +166,21 @@
     <property
         name="passMark"
         type="java.lang.Integer"
-        update="true"
-        insert="true"
         access="property"        
         column="pass_mark"
     />
 
     <property
         name="showFeedback"
         type="boolean"
-        update="true"
-        insert="true"
         access="property"        
         column="show_feedback"
         length="1"
     />
     
    	 <set
             name="mcQueContents"
-            lazy="false"
+            lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
             sort="unsorted"
@@ -240,7 +198,7 @@
 
 	<set
             name="mcSessions"
-            lazy="false"
+            lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
             sort="unsorted"
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 -r1.4 -r1.5
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml	10 Oct 2005 14:47:30 -0000	1.4
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml	14 Oct 2005 15:50:10 -0000	1.5
@@ -45,6 +45,7 @@
     <many-to-one
         name="mcQueContent"
         class="org.lamsfoundation.lams.tool.mc.McQueContent"
+        not-null="true"        
         cascade="none"
         outer-join="auto"
         update="true"
@@ -53,11 +54,10 @@
     >
         <column name="mc_que_content_id" />
     </many-to-one>
-
     
     <set
         name="mcUsrAttempts"
-        lazy="false"
+        lazy="true"
         inverse="true"
 		cascade="all-delete-orphan"
     >
@@ -68,8 +68,6 @@
             class="org.lamsfoundation.lams.tool.mc.McUsrAttempt"
         />
     </set>
-    
-    
    
 </class>
 </hibernate-mapping>
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.8 -r1.9
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml	12 Oct 2005 18:55:58 -0000	1.8
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml	14 Oct 2005 15:50:10 -0000	1.9
@@ -53,12 +53,12 @@
     <many-to-one
         name="mcContent"
         class="org.lamsfoundation.lams.tool.mc.McContent"
+        not-null="true"        
 	    cascade="none"
 	    outer-join="auto"
 	    update="true"
 	    insert="true"
 	    access="property"
-        not-null="true"
     >
         <column name="mc_content_id" />
     </many-to-one>
@@ -69,7 +69,7 @@
         name="mcOptionsContents"
         lazy="true"
         inverse="true"
-		cascade="none"
+		cascade="all-delete-orphan"
     >
         <key>
             <column name="mc_que_content_id" />
@@ -82,9 +82,9 @@
     
     <set
         name="mcUsrAttempts"
-        lazy="false"
+        lazy="true"
         inverse="true"
-		cascade="none"
+		cascade="all-delete-orphan"
 	>
 
         <key>
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.5 -r1.6
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml	7 Oct 2005 20:17:49 -0000	1.5
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml	14 Oct 2005 15:50:10 -0000	1.6
@@ -45,6 +45,7 @@
     <many-to-one
         name="mcSession"
         class="org.lamsfoundation.lams.tool.mc.McSession"
+        not-null="true"        
         cascade="none"
         outer-join="auto"
         update="true"
@@ -56,7 +57,7 @@
 
    	 <set
             name="mcUsrAttempts"
-            lazy="false"
+            lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
             sort="unsorted"
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.5 -r1.6
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml	7 Oct 2005 20:17:49 -0000	1.5
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml	14 Oct 2005 15:50:10 -0000	1.6
@@ -28,8 +28,6 @@
     <property
         name="sessionStartDate"
         type="java.util.Date"
-        update="true"
-        insert="true"
         access="property"
         column="session_start_date"
         length="20"
@@ -38,8 +36,6 @@
     <property
         name="sessionEndDate"
         type="java.util.Date"
-        update="true"
-        insert="true"
         access="property"
         column="session_end_date"
         length="20"
@@ -48,8 +44,6 @@
     <property
         name="sessionStatus"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"
         column="session_status"
         length="100"
@@ -68,6 +62,7 @@
    <many-to-one
         name="mcContent"
         class="org.lamsfoundation.lams.tool.mc.McContent"
+        not-null="true"        
         cascade="none"
         outer-join="auto"
         update="true"
@@ -81,7 +76,7 @@
     
     <set
         name="mcQueUsers"
-        lazy="false"
+        lazy="true"
         inverse="true"
         cascade="all-delete-orphan"
         sort="unsorted"
Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/Attic/McUsrAttempt.hbm.xml,v
diff -u -r1.7 -r1.8
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml	10 Oct 2005 14:47:30 -0000	1.7
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml	14 Oct 2005 15:50:10 -0000	1.8
@@ -20,8 +20,6 @@
     <property
         name="attemptTime"
         type="java.util.Date"
-        update="true"
-        insert="true"
         access="property"
         column="attempt_time"
         length="20"
@@ -31,8 +29,6 @@
     <property
         name="timeZone"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"
         column="time_zone"
         length="255"
@@ -42,6 +38,7 @@
     <many-to-one
         name="mcQueContent"
         class="org.lamsfoundation.lams.tool.mc.McQueContent"
+        not-null="true"        
    	    cascade="none"
 	    outer-join="auto"
 	    update="true"
@@ -54,6 +51,7 @@
     <many-to-one
         name="mcQueUsr"
         class="org.lamsfoundation.lams.tool.mc.McQueUsr"
+        not-null="true"        
 	    cascade="none"
 	    outer-join="auto"
 	    update="true"
@@ -66,6 +64,7 @@
     <many-to-one
         name="mcOptionsContent"
         class="org.lamsfoundation.lams.tool.mc.McOptsContent"
+        not-null="true"                
 	    cascade="none"
 	    outer-join="auto"
 	    update="true"
Index: lams_tool_lamc/db/sql/tool_insert.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/tool_insert.sql,v
diff -u -r1.2 -r1.3
--- lams_tool_lamc/db/sql/tool_insert.sql	4 Oct 2005 12:12:30 -0000	1.2
+++ lams_tool_lamc/db/sql/tool_insert.sql	14 Oct 2005 15:50:11 -0000	1.3
@@ -36,7 +36,7 @@
 'mc',
 '1.1',
 NULL,
-NULL,
+10,
 0,
 1,
 1,
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java,v
diff -u -r1.3 -r1.4
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	13 Oct 2005 15:28:37 -0000	1.3
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	14 Oct 2005 15:50:10 -0000	1.4
@@ -76,6 +76,11 @@
     public static final String LOAD										="load";
     public static final String LOAD_QUESTIONS							="load";
     public static final String LOAD_STARTER								="starter";
+    public static final String EDIT_OPTS_CONTENT						="editOptsContent";
+    public static final String ADD_OPTS_CONTENT							="addOptsContent";
+    public static final String REMOVE_OPTS_CONTENT						="removeOptsContent";
+    
+    
     public static final String AUTHORING_BASIC							="authoringBasic";
     public static final boolean MODE_OPTIONAL 							= false;
     public static final String DISABLE_TOOL								="disabled";
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.8 -r1.9
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml	11 Oct 2005 11:35:27 -0000	1.8
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml	14 Oct 2005 15:50:10 -0000	1.9
@@ -29,8 +29,6 @@
     <property
         name="title"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"
         column="title"
         length="100"
@@ -39,8 +37,6 @@
     <property
         name="instructions"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="instructions"
         length="255"
@@ -50,18 +46,13 @@
    <property
             name="defineLater"
             type="boolean"
-            update="true"
-            insert="true"
             access="property"
             column="define_later"
    />
 
-
    <property
             name="runOffline"
             type="boolean"
-            update="true"
-            insert="true"
             access="property"
             column="run_offline"
    />
@@ -70,8 +61,6 @@
     <property
         name="creationDate"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="creation_date"
         length="10"
@@ -81,8 +70,6 @@
     <property
         name="updateDate"
         type="java.util.Date"
-        update="true"
-        insert="true"
         access="property"        
         column="update_date"
         length="20"
@@ -92,17 +79,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"
@@ -111,41 +94,30 @@
     <property
         name="reportTitle"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="report_title"
         length="100"
     />
     
-
     <property
         name="monitoringReportTitle"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="monitoring_report_title"
         length="100"
     />
  
- 
     <property
         name="createdBy"
         type="long"
-        update="true"
-        insert="true"
         access="property"        
         column="created_by"
         length="20"
     />
 
-
     <property
         name="synchInMonitor"
         type="boolean"
-        update="true"
-        insert="true"
         access="property"        
         column="synch_in_monitor"
         length="1"
@@ -154,8 +126,6 @@
     <property
         name="contentInUse"
         type="boolean"
-        update="true"
-        insert="true"
         access="property"        
         column="content_in_use"
         length="1"
@@ -164,8 +134,6 @@
     <property
         name="offlineInstructions"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="offline_instructions"
         length="65535"
@@ -174,8 +142,6 @@
     <property
         name="onlineInstructions"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="online_instructions"
         length="65535"
@@ -184,8 +150,6 @@
     <property
         name="endLearningMessage"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="end_learning_message"
         length="65535"
@@ -194,8 +158,6 @@
     <property
         name="retries"
         type="boolean"
-        update="true"
-        insert="true"
         access="property"        
         column="retries"
         length="1"
@@ -204,25 +166,21 @@
     <property
         name="passMark"
         type="java.lang.Integer"
-        update="true"
-        insert="true"
         access="property"        
         column="pass_mark"
     />
 
     <property
         name="showFeedback"
         type="boolean"
-        update="true"
-        insert="true"
         access="property"        
         column="show_feedback"
         length="1"
     />
     
    	 <set
             name="mcQueContents"
-            lazy="false"
+            lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
             sort="unsorted"
@@ -240,7 +198,7 @@
 
 	<set
             name="mcSessions"
-            lazy="false"
+            lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
             sort="unsorted"
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 -r1.4 -r1.5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml	10 Oct 2005 14:45:20 -0000	1.4
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml	14 Oct 2005 15:50:10 -0000	1.5
@@ -45,6 +45,7 @@
     <many-to-one
         name="mcQueContent"
         class="org.lamsfoundation.lams.tool.mc.McQueContent"
+        not-null="true"        
         cascade="none"
         outer-join="auto"
         update="true"
@@ -53,11 +54,10 @@
     >
         <column name="mc_que_content_id" />
     </many-to-one>
-
     
     <set
         name="mcUsrAttempts"
-        lazy="false"
+        lazy="true"
         inverse="true"
 		cascade="all-delete-orphan"
     >
@@ -68,8 +68,6 @@
             class="org.lamsfoundation.lams.tool.mc.McUsrAttempt"
         />
     </set>
-    
-    
    
 </class>
 </hibernate-mapping>
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.8 -r1.9
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml	12 Oct 2005 18:55:58 -0000	1.8
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml	14 Oct 2005 15:50:10 -0000	1.9
@@ -53,12 +53,12 @@
     <many-to-one
         name="mcContent"
         class="org.lamsfoundation.lams.tool.mc.McContent"
+        not-null="true"        
 	    cascade="none"
 	    outer-join="auto"
 	    update="true"
 	    insert="true"
 	    access="property"
-        not-null="true"
     >
         <column name="mc_content_id" />
     </many-to-one>
@@ -69,7 +69,7 @@
         name="mcOptionsContents"
         lazy="true"
         inverse="true"
-		cascade="none"
+		cascade="all-delete-orphan"
     >
         <key>
             <column name="mc_que_content_id" />
@@ -82,9 +82,9 @@
     
     <set
         name="mcUsrAttempts"
-        lazy="false"
+        lazy="true"
         inverse="true"
-		cascade="none"
+		cascade="all-delete-orphan"
 	>
 
         <key>
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.5 -r1.6
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml	7 Oct 2005 20:17:49 -0000	1.5
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml	14 Oct 2005 15:50:10 -0000	1.6
@@ -45,6 +45,7 @@
     <many-to-one
         name="mcSession"
         class="org.lamsfoundation.lams.tool.mc.McSession"
+        not-null="true"        
         cascade="none"
         outer-join="auto"
         update="true"
@@ -56,7 +57,7 @@
 
    	 <set
             name="mcUsrAttempts"
-            lazy="false"
+            lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
             sort="unsorted"
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Attic/McResources.properties,v
diff -u -r1.2 -r1.3
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties	13 Oct 2005 15:28:37 -0000	1.2
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties	14 Oct 2005 15:50:10 -0000	1.3
@@ -11,14 +11,17 @@
 button.instructions						=Instructions 
 button.done								=Done
 tool.icon.name							=MC
+button.add								=+
 button.addNewQuestion					=+
+button.remove							=-
 button.removeQuestion					=-
 button.removeAllContent					=Remove Content
 button.submitAllContent					=Submit
 button.done								=Done
 button.getNextQuestion					=Next
 button.getPreviousQuestion				=Previous
 button.editQuestion						=Edit
+label.option1							=Option 1
 
 label.report.title						=Report Title
 label.monitoringReport.title			=Monitoring Report Title
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.4 -r1.5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml	7 Oct 2005 20:17:49 -0000	1.4
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml	14 Oct 2005 15:50:10 -0000	1.5
@@ -28,8 +28,6 @@
     <property
         name="sessionStartDate"
         type="java.util.Date"
-        update="true"
-        insert="true"
         access="property"
         column="session_start_date"
         length="20"
@@ -38,8 +36,6 @@
     <property
         name="sessionEndDate"
         type="java.util.Date"
-        update="true"
-        insert="true"
         access="property"
         column="session_end_date"
         length="20"
@@ -48,8 +44,6 @@
     <property
         name="sessionStatus"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"
         column="session_status"
         length="100"
@@ -68,6 +62,7 @@
    <many-to-one
         name="mcContent"
         class="org.lamsfoundation.lams.tool.mc.McContent"
+        not-null="true"        
         cascade="none"
         outer-join="auto"
         update="true"
@@ -81,7 +76,7 @@
     
     <set
         name="mcQueUsers"
-        lazy="false"
+        lazy="true"
         inverse="true"
         cascade="all-delete-orphan"
         sort="unsorted"
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Attic/McUsrAttempt.hbm.xml,v
diff -u -r1.7 -r1.8
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml	10 Oct 2005 14:45:20 -0000	1.7
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml	14 Oct 2005 15:50:10 -0000	1.8
@@ -20,8 +20,6 @@
     <property
         name="attemptTime"
         type="java.util.Date"
-        update="true"
-        insert="true"
         access="property"
         column="attempt_time"
         length="20"
@@ -31,8 +29,6 @@
     <property
         name="timeZone"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"
         column="time_zone"
         length="255"
@@ -42,6 +38,7 @@
     <many-to-one
         name="mcQueContent"
         class="org.lamsfoundation.lams.tool.mc.McQueContent"
+        not-null="true"        
    	    cascade="none"
 	    outer-join="auto"
 	    update="true"
@@ -54,6 +51,7 @@
     <many-to-one
         name="mcQueUsr"
         class="org.lamsfoundation.lams.tool.mc.McQueUsr"
+        not-null="true"        
 	    cascade="none"
 	    outer-join="auto"
 	    update="true"
@@ -66,6 +64,7 @@
     <many-to-one
         name="mcOptionsContent"
         class="org.lamsfoundation.lams.tool.mc.McOptsContent"
+        not-null="true"                
 	    cascade="none"
 	    outer-join="auto"
 	    update="true"
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java,v
diff -u -r1.1 -r1.2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	13 Oct 2005 15:28:37 -0000	1.1
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	14 Oct 2005 15:50:11 -0000	1.2
@@ -216,6 +216,7 @@
 	 	if (mcAuthoringForm.getEditDefaultQuestion() != null)
 	 	{
 	 		userAction="editDefaultQuestion";
+	 		return (mapping.findForward(EDIT_OPTS_CONTENT));
 	 		
 	 	}
 	 	logger.debug("userAction:" + userAction);
@@ -225,7 +226,40 @@
    	    return (mapping.findForward(LOAD_QUESTIONS));
     }
     
+    
+    public ActionForward editDefaultContent(ActionMapping mapping,
+            ActionForm form,
+            HttpServletRequest request,
+            HttpServletResponse response) throws IOException,
+                                         ServletException
+	{
+		logger.debug("editDefaultContent initialised...");
+		McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
 
+		String userAction=null;
+	 	if (mcAuthoringForm.getAddOptionContent() != null)
+	 	{
+	 		userAction="addOptionContent";
+	 		return (mapping.findForward(EDIT_OPTS_CONTENT));
+	 		
+	 	}
+	 	else if (mcAuthoringForm.getRemoveOptionContent() != null)
+	 	{
+	 		userAction="removeOptionContent";
+	 		return (mapping.findForward(EDIT_OPTS_CONTENT));
+	 		
+	 	}
+	 	logger.debug("userAction:" + userAction);
+		
+		
+		IMcService mcService =McUtils.getToolService(request);
+		logger.debug("mcService:" + mcService);
+		return (mapping.findForward(LOAD_QUESTIONS));
+	}
+    
+    
+    
+
     /**
      * persists error messages to request scope
      * @param request
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java,v
diff -u -r1.2 -r1.3
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java	13 Oct 2005 15:28:37 -0000	1.2
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java	14 Oct 2005 15:50:11 -0000	1.3
@@ -23,8 +23,9 @@
 public class McAuthoringForm extends ActionForm implements McAppConstants {
 	/** form controllers */
 	protected String editDefaultQuestion;
+	protected String addOptionContent;	
+	protected String removeOptionContent;
 	
-	
 	protected String addContent;
 	protected String removeContent;
 	protected String removeAllContent;
@@ -74,6 +75,9 @@
 	public void resetUserAction()
     {
 		this.editDefaultQuestion=null;
+		this.addOptionContent=null;	
+		this.removeOptionContent=null;
+		
     	this.addContent=null;	
     	this.removeContent=null;
     	this.removeAllContent=null;
@@ -91,6 +95,10 @@
 	
 	public void reset()
 	{
+		this.editDefaultQuestion=null;
+		this.addOptionContent=null;	
+		this.removeOptionContent=null;
+		
 		this.addContent=null;
 		this.removeContent=null;
 		this.removeAllContent=null;
@@ -551,4 +559,28 @@
 	public void setEditDefaultQuestion(String editDefaultQuestion) {
 		this.editDefaultQuestion = editDefaultQuestion;
 	}
+	/**
+	 * @return Returns the addOptionContent.
+	 */
+	public String getAddOptionContent() {
+		return addOptionContent;
+	}
+	/**
+	 * @param addOptionContent The addOptionContent to set.
+	 */
+	public void setAddOptionContent(String addOptionContent) {
+		this.addOptionContent = addOptionContent;
+	}
+	/**
+	 * @return Returns the removeOptionContent.
+	 */
+	public String getRemoveOptionContent() {
+		return removeOptionContent;
+	}
+	/**
+	 * @param removeOptionContent The removeOptionContent to set.
+	 */
+	public void setRemoveOptionContent(String removeOptionContent) {
+		this.removeOptionContent = removeOptionContent;
+	}
 }
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.7 -r1.8
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml	11 Oct 2005 11:35:27 -0000	1.7
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml	14 Oct 2005 15:50:11 -0000	1.8
@@ -29,8 +29,6 @@
     <property
         name="title"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"
         column="title"
         length="100"
@@ -39,8 +37,6 @@
     <property
         name="instructions"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="instructions"
         length="255"
@@ -50,18 +46,13 @@
    <property
             name="defineLater"
             type="boolean"
-            update="true"
-            insert="true"
             access="property"
             column="define_later"
    />
 
-
    <property
             name="runOffline"
             type="boolean"
-            update="true"
-            insert="true"
             access="property"
             column="run_offline"
    />
@@ -70,8 +61,6 @@
     <property
         name="creationDate"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="creation_date"
         length="10"
@@ -81,8 +70,6 @@
     <property
         name="updateDate"
         type="java.util.Date"
-        update="true"
-        insert="true"
         access="property"        
         column="update_date"
         length="20"
@@ -92,17 +79,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"
@@ -111,41 +94,30 @@
     <property
         name="reportTitle"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="report_title"
         length="100"
     />
     
-
     <property
         name="monitoringReportTitle"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="monitoring_report_title"
         length="100"
     />
  
- 
     <property
         name="createdBy"
         type="long"
-        update="true"
-        insert="true"
         access="property"        
         column="created_by"
         length="20"
     />
 
-
     <property
         name="synchInMonitor"
         type="boolean"
-        update="true"
-        insert="true"
         access="property"        
         column="synch_in_monitor"
         length="1"
@@ -154,8 +126,6 @@
     <property
         name="contentInUse"
         type="boolean"
-        update="true"
-        insert="true"
         access="property"        
         column="content_in_use"
         length="1"
@@ -164,8 +134,6 @@
     <property
         name="offlineInstructions"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="offline_instructions"
         length="65535"
@@ -174,8 +142,6 @@
     <property
         name="onlineInstructions"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="online_instructions"
         length="65535"
@@ -184,8 +150,6 @@
     <property
         name="endLearningMessage"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"        
         column="end_learning_message"
         length="65535"
@@ -194,8 +158,6 @@
     <property
         name="retries"
         type="boolean"
-        update="true"
-        insert="true"
         access="property"        
         column="retries"
         length="1"
@@ -204,25 +166,21 @@
     <property
         name="passMark"
         type="java.lang.Integer"
-        update="true"
-        insert="true"
         access="property"        
         column="pass_mark"
     />
 
     <property
         name="showFeedback"
         type="boolean"
-        update="true"
-        insert="true"
         access="property"        
         column="show_feedback"
         length="1"
     />
     
    	 <set
             name="mcQueContents"
-            lazy="false"
+            lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
             sort="unsorted"
@@ -240,7 +198,7 @@
 
 	<set
             name="mcSessions"
-            lazy="false"
+            lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
             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.10 -r1.11
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java	13 Oct 2005 15:28:37 -0000	1.10
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java	14 Oct 2005 15:50:11 -0000	1.11
@@ -81,7 +81,7 @@
     }
     
     
-    /*
+    
     public void testInitDB()
     {
     	//create new mc content
@@ -128,6 +128,6 @@
      	McOptsContent mcOptionsContent3= new McOptsContent(new Long(999), false, "sample answer 3", mcQueContent1, new HashSet());
      	mcOptionsContentDAO.saveMcOptionsContent(mcOptionsContent3);
    }
-*/
+
     
 }
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 -r1.4 -r1.5
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml	10 Oct 2005 14:47:44 -0000	1.4
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml	14 Oct 2005 15:50:11 -0000	1.5
@@ -45,6 +45,7 @@
     <many-to-one
         name="mcQueContent"
         class="org.lamsfoundation.lams.tool.mc.McQueContent"
+        not-null="true"        
         cascade="none"
         outer-join="auto"
         update="true"
@@ -53,11 +54,10 @@
     >
         <column name="mc_que_content_id" />
     </many-to-one>
-
     
     <set
         name="mcUsrAttempts"
-        lazy="false"
+        lazy="true"
         inverse="true"
 		cascade="all-delete-orphan"
     >
@@ -68,8 +68,6 @@
             class="org.lamsfoundation.lams.tool.mc.McUsrAttempt"
         />
     </set>
-    
-    
    
 </class>
 </hibernate-mapping>
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.7 -r1.8
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml	12 Oct 2005 18:55:58 -0000	1.7
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml	14 Oct 2005 15:50:11 -0000	1.8
@@ -53,12 +53,12 @@
     <many-to-one
         name="mcContent"
         class="org.lamsfoundation.lams.tool.mc.McContent"
+        not-null="true"        
 	    cascade="none"
 	    outer-join="auto"
 	    update="true"
 	    insert="true"
 	    access="property"
-        not-null="true"
     >
         <column name="mc_content_id" />
     </many-to-one>
@@ -69,7 +69,7 @@
         name="mcOptionsContents"
         lazy="true"
         inverse="true"
-		cascade="none"
+		cascade="all-delete-orphan"
     >
         <key>
             <column name="mc_que_content_id" />
@@ -82,9 +82,9 @@
     
     <set
         name="mcUsrAttempts"
-        lazy="false"
+        lazy="true"
         inverse="true"
-		cascade="none"
+		cascade="all-delete-orphan"
 	>
 
         <key>
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.4 -r1.5
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml	7 Oct 2005 20:19:26 -0000	1.4
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml	14 Oct 2005 15:50:11 -0000	1.5
@@ -45,6 +45,7 @@
     <many-to-one
         name="mcSession"
         class="org.lamsfoundation.lams.tool.mc.McSession"
+        not-null="true"        
         cascade="none"
         outer-join="auto"
         update="true"
@@ -56,7 +57,7 @@
 
    	 <set
             name="mcUsrAttempts"
-            lazy="false"
+            lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
             sort="unsorted"
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.4 -r1.5
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml	7 Oct 2005 20:19:26 -0000	1.4
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml	14 Oct 2005 15:50:11 -0000	1.5
@@ -28,8 +28,6 @@
     <property
         name="sessionStartDate"
         type="java.util.Date"
-        update="true"
-        insert="true"
         access="property"
         column="session_start_date"
         length="20"
@@ -38,8 +36,6 @@
     <property
         name="sessionEndDate"
         type="java.util.Date"
-        update="true"
-        insert="true"
         access="property"
         column="session_end_date"
         length="20"
@@ -48,8 +44,6 @@
     <property
         name="sessionStatus"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"
         column="session_status"
         length="100"
@@ -68,6 +62,7 @@
    <many-to-one
         name="mcContent"
         class="org.lamsfoundation.lams.tool.mc.McContent"
+        not-null="true"        
         cascade="none"
         outer-join="auto"
         update="true"
@@ -81,7 +76,7 @@
     
     <set
         name="mcQueUsers"
-        lazy="false"
+        lazy="true"
         inverse="true"
         cascade="all-delete-orphan"
         sort="unsorted"
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/Attic/McUsrAttempt.hbm.xml,v
diff -u -r1.6 -r1.7
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml	10 Oct 2005 14:47:44 -0000	1.6
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml	14 Oct 2005 15:50:11 -0000	1.7
@@ -20,8 +20,6 @@
     <property
         name="attemptTime"
         type="java.util.Date"
-        update="true"
-        insert="true"
         access="property"
         column="attempt_time"
         length="20"
@@ -31,8 +29,6 @@
     <property
         name="timeZone"
         type="java.lang.String"
-        update="true"
-        insert="true"
         access="property"
         column="time_zone"
         length="255"
@@ -42,6 +38,7 @@
     <many-to-one
         name="mcQueContent"
         class="org.lamsfoundation.lams.tool.mc.McQueContent"
+        not-null="true"        
    	    cascade="none"
 	    outer-join="auto"
 	    update="true"
@@ -54,6 +51,7 @@
     <many-to-one
         name="mcQueUsr"
         class="org.lamsfoundation.lams.tool.mc.McQueUsr"
+        not-null="true"        
 	    cascade="none"
 	    outer-join="auto"
 	    update="true"
@@ -66,6 +64,7 @@
     <many-to-one
         name="mcOptionsContent"
         class="org.lamsfoundation.lams.tool.mc.McOptsContent"
+        not-null="true"                
 	    cascade="none"
 	    outer-join="auto"
 	    update="true"
Index: lams_tool_lamc/test/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/test/web/WEB-INF/Attic/web.xml,v
diff -u -r1.5 -r1.6
--- lams_tool_lamc/test/web/WEB-INF/web.xml	12 Oct 2005 18:55:58 -0000	1.5
+++ lams_tool_lamc/test/web/WEB-INF/web.xml	14 Oct 2005 15:50:11 -0000	1.6
@@ -3,39 +3,38 @@
 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
 
 <web-app >
+ <context-param>
+  	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
+  	<param-value>org.lamsfoundation.lams.tool.mc.web.McResources</param-value>
+</context-param>
 	<context-param>
-	  	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-	  	<param-value>org.lamsfoundation.lams.tool.mc.McResources</param-value>
-	</context-param>
-	<context-param>
 		<param-name>contextConfigLocation</param-name>
 		<param-value>
 			classpath:/org/lamsfoundation/lams/applicationContext.xml
-	    	classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-	    	classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
-	    	classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
+            classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
+            classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
 			classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
+			classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
 			classpath:/org/lamsfoundation/lams/tool/mc/mcApplicationContext.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>mcSessionFactory</param-value>
+    </init-param>
+   </filter>
    <!-- System session filter -->
-   
    <filter>
        <filter-name>SystemSessionFilter</filter-name>
          <filter-class>
@@ -44,44 +43,14 @@
      </filter>
 
     <filter-mapping>
- 	   <filter-name>SystemSessionFilter</filter-name>
-    	 <url-pattern>/*</url-pattern>
-   </filter-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>
@@ -138,48 +107,96 @@
       <session-timeout>120</session-timeout>
    </session-config>
    
-   <taglib>
+     <error-page>
+		<error-code>403</error-code>
+		<location>/403.html</location>
+	</error-page>
+
+  <!-- Struts Tag Library Descriptors -->
+
+<taglib>
     <taglib-uri>fck-editor</taglib-uri>
     <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
-  </taglib>
+</taglib>
 
-   <!--
-   To specify mime mappings, create a file named mime-mappings.xml, put it in your project's mergedir.
-   Organize mime-mappings.xml following this DTD slice:
+  	<!--  Security Constraint -->
+	<security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Secure Content</web-resource-name>
+			<url-pattern>/*</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>LEARNER</role-name>
+    		<role-name>TEACHER</role-name>
+    		<role-name>STAFF</role-name>
+    		<role-name>AUTHOR</role-name>
+    		<role-name>ADMIN</role-name>
+    		<role-name>SYSADMIN</role-name>
+    	</auth-constraint>
+    </security-constraint>
 
-   <!ELEMENT mime-mapping (extension, mime-type)>
-   -->
+   <!--  Security Constraint -->
+	<security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Secure Content</web-resource-name>
+			<url-pattern>/*</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>LEARNER</role-name>
+    		<role-name>TEACHER</role-name>
+    		<role-name>STAFF</role-name>
+    		<role-name>AUTHOR</role-name>
+    		<role-name>ADMIN</role-name>
+    		<role-name>SYSADMIN</role-name>
+    	</auth-constraint>
+    </security-constraint>
 
-   <!--
-   To specify error pages, create a file named error-pages.xml, put it in your project's mergedir.
-   Organize error-pages.xml following this DTD slice:
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Authoring Update</web-resource-name>
+		    <url-pattern>/authoringStarter.do</url-pattern>
+		   <url-pattern>/authoring.do</url-pattern>
+		 </web-resource-collection>
+    	<auth-constraint>
+    		<role-name>AUTHOR</role-name>
+    	</auth-constraint>
+    </security-constraint>
+    
+    
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Staff Content</web-resource-name>
+		    <url-pattern>/monitoringStarter.do</url-pattern>
+		    <url-pattern>/monitoring.do</url-pattern>		   
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>STAFF</role-name>
+    	</auth-constraint>
+    </security-constraint>
 
-   <!ELEMENT error-page ((error-code | exception-type), location)>
-   -->
+    
+	<!--  some combine role security setting -->
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Download Files</web-resource-name>
+		    <url-pattern>/download/</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>AUTHOR</role-name>
+    		<role-name>STAFF</role-name>
+    		<role-name>ADMIN</role-name>
+    		<role-name>SYSADMIN</role-name>
+    	</auth-constraint>
+    </security-constraint>
 
-  <!--
-  To add taglibs by xml, create a file called taglibs.xml and place it
-  in your merge dir.
-  -->
 
-   <!--
-   To set up security settings for your web app, create a file named web-security.xml, put it in your project's mergedir.
-   Organize web-security.xml following this DTD slice:
+	<!--  Login Configuration -->
+  	<login-config>
+   		<auth-method>FORM</auth-method>
+		<realm-name>LAMS</realm-name>
+   		<form-login-config>
+    		<form-login-page>/login.jsp</form-login-page>
+   		</form-login-config>
+   	</login-config>
 
-   <!ELEMENT security-constraint (display-name?, web-resource-collection+, auth-constraint?, user-data-constraint?)>
-   <!ELEMENT web-resource-collection (web-resource-name, description?, url-pattern*, http-method*)>
-   <!ELEMENT web-resource-name (#PCDATA)>
-   <!ELEMENT url-pattern (#PCDATA)>
-   <!ELEMENT http-method (#PCDATA)>
-   <!ELEMENT user-data-constraint (description?, transport-guarantee)>
-   <!ELEMENT transport-guarantee (#PCDATA)>
-
-   <!ELEMENT login-config (auth-method?, realm-name?, form-login-config?)>
-   <!ELEMENT auth-method (#PCDATA)>
-   <!ELEMENT realm-name (#PCDATA)>
-   <!ELEMENT form-login-config (form-login-page, form-error-page)>
-   <!ELEMENT form-login-page (#PCDATA)>
-   <!ELEMENT form-error-page (#PCDATA)>
-   -->
-
 </web-app>
Index: lams_tool_lamc/test/web/WEB-INF/tiles/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/test/web/WEB-INF/tiles/Attic/tiles-defs.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_lamc/test/web/WEB-INF/tiles/tiles-defs.xml	12 Oct 2005 18:55:58 -0000	1.3
+++ lams_tool_lamc/test/web/WEB-INF/tiles/tiles-defs.xml	14 Oct 2005 15:50:11 -0000	1.4
@@ -47,12 +47,21 @@
 		<put name="pageHeader" value = "Questions for Multiple Choice"/>
 		<put name="content" value="authoringMaincontent.jsp" />	
 	</definition>
-	
+
+	<definition name=".editOptsContent" extends=".baseDef" >
+		<put name="title" value="Edit Content"/>
+		<put name="pageHeader" value = "Edit Content"/>
+		<put name="content" value="editDefaultContent.jsp" />	
+	</definition>
+		
 <!-- ============= Qa Authoring Starter Page Definitions ====================== -->	
 	<definition name=".starter" extends=".baseDef" >
 		<put name="title" value="Starter for Multiple Choice Authoring"/>
 		<put name="pageHeader" value = "Starter for Multiple Choice Authoring"/>
 		<put name="content" value="/index.jsp" />	
 	</definition>
+	
+	
 
+
 </tiles-definitions>
\ No newline at end of file
Index: lams_tool_lamc/web/authoringMaincontent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/Attic/authoringMaincontent.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_lamc/web/authoringMaincontent.jsp	13 Oct 2005 15:28:37 -0000	1.3
+++ lams_tool_lamc/web/authoringMaincontent.jsp	14 Oct 2005 15:50:11 -0000	1.4
@@ -1,10 +1,11 @@
 <%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %>
-<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
 <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
+<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %>
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 
+
 <%
 String protocol = request.getProtocol();
 if(protocol.startsWith("HTTPS")){
@@ -82,8 +83,10 @@
 </td>
   </tr>
 </table>
-    <!-- end tab buttons -->
 
+ <!-- end tab buttons -->
+
+
 <!-- error holder table -->    
 <table border="0" cellspacing="0" cellpadding="0">
 <tr> 
@@ -92,7 +95,6 @@
 </td></tr>    
 </table>
 
-
 <html:form  action="/authoring?method=loadQ&validate=false" enctype="multipart/form-data" method="POST" target="_self">
  <!-- tab content one (basic)-->
 <div id='content_b' class="tabbody content_b" >
@@ -175,6 +177,10 @@
 </html:form>
 <p></p>
 
+
+</body>
+</html:html>
+
 <SCRIPT language="JavaScript"> 
 	function editQuestion(questionIndex)
 	{
@@ -188,11 +194,5 @@
 
 
 
-</body>
-</html:html>
 
 
-
-
-
-
Index: lams_tool_lamc/web/editDefaultContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/Attic/editDefaultContent.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/editDefaultContent.jsp	14 Oct 2005 15:50:11 -0000	1.1
@@ -0,0 +1 @@
+TEST!!!
\ No newline at end of file
Index: lams_tool_lamc/web/login.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/login.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/login.jsp	14 Oct 2005 15:50:11 -0000	1.1
@@ -0,0 +1,24 @@
+
+<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
+<%
+String path = request.getContextPath();
+String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <base href="<%=basePath%>">
+    
+    <title>System logon required</title>
+
+    <!--
+    <link rel="stylesheet" type="text/css" href="styles.css">
+    -->
+  </head>
+  
+  <body>
+	You need login <a href="/lams/index.jsp">here</a>.
+
+  </body>
+</html>
Index: lams_tool_lamc/web/standardTabHeader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/Attic/standardTabHeader.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/standardTabHeader.jsp	14 Oct 2005 15:50:11 -0000	1.1
@@ -0,0 +1,86 @@
+<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
+<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %>
+
+
+<%
+String protocol = request.getProtocol();
+if(protocol.startsWith("HTTPS")){
+	protocol = "https://";
+}else{
+	protocol = "http://";
+}
+String root = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/";
+String pathToLams = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/../..";
+
+%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html:html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>Tool</title>
+<script type="text/javascript" src="<%=root%>author_page/js/tabcontroller.js"></script>
+<script src="<%=pathToLams%>/includes/javascript/common.js"></script>
+<!-- this is the custom CSS for hte tool -->
+<link href="<%=root%>author_page/css/tool_custom.css" rel="stylesheet" type="text/css">
+<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
+<link href="<%=root%>author_page/css/aqua.css" rel="stylesheet" type="text/css">
+<script language="JavaScript" type="text/JavaScript">
+<!--
+function MM_reloadPage(init) {  //reloads the window if Nav4 resized
+  if (init==true) with (navigator) {if ((appName=="Netscape")&&(parseInt(appVersion)==4)) {
+    document.MM_pgW=innerWidth; document.MM_pgH=innerHeight; onresize=MM_reloadPage; }}
+  else if (innerWidth!=document.MM_pgW || innerHeight!=document.MM_pgH) location.reload();
+}
+MM_reloadPage(true);
+//-->
+</script>
+</head>
+<body onLoad="initTabs()">
+
+<h1>Multipe Choice</h1>
+    
+    <!-- start tabs -->
+<!-- tab holder table -->
+<table border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td valign="bottom">
+	<!-- table for tab 1 (basic)-->
+	<table border="0" cellspacing="0" cellpadding="0">
+	  <tr>
+		<td><a href="#"  onClick="showTab('b');return false;" ><img src="author_page/images/aqua_tab_s_left.gif" name="tab_left_b" width="8" height="25" border="0" id="tab_left_b"/></a></td>
+		<td class="tab tabcentre_selected" width="90" id="tab_tbl_centre_b"  onClick="showTab('b');return false;" ><label for="b" accesskey="b"><a href="#" onClick="showTab('b');return false;" id="b" >Basic</a></label></td>
+		<td><a href="#" onClick="showTab('b');return false;"><img src="author_page/images/aqua_tab_s_right.gif"  name="tab_right_b" width="8" height="25" border="0" id="tab_right_b"/></a></td>
+	  </tr>
+	</table>
+
+</td>
+    <td valign="bottom">
+	<!-- table for tab 2 (advanced) -->
+	<table border="0" cellspacing="0" cellpadding="0">
+	  <tr>
+		<td><a href="#" onClick="showTab('a');return false;"><img src="author_page/images/aqua_tab_left.gif" name="tab_left_a" width="8" height="22" border="0" id="tab_left_a" /></a></td>
+		<td class="tab tabcentre" width="90" id="tab_tbl_centre_a" onClick="showTab('a');return false;"><label for="a" accesskey="a"><a href="#" onClick="showTab('a');return false;" id="a" >Advanced</a></label></td>
+		<td><a href="#" onClick="showTab('a');return false;"><img src="author_page/images/aqua_tab_right.gif" name="tab_right_a" width="9" height="22" border="0" id="tab_right_a" /></a></td>
+	  </tr>
+	</table>
+
+</td>
+    <td valign="bottom">
+	<!-- table for ab 3 (instructions) -->
+	<table border="0" cellspacing="0" cellpadding="0">
+	  <tr>
+		<td ><a href="#" onClick="showTab('i');return false;"><img border="0" src="author_page/images/aqua_tab_left.gif" width="8" height="22" id="tab_left_i"   name="tab_left_i" /></a></td>
+		<td class="tab tabcentre" width="90" id="tab_tbl_centre_i"  onClick="showTab('i');return false;" ><label for="i" accesskey="i"><a href="#" onClick="showTab('i');return false;" id="i" >Instructions</a></label></td>
+		<td ><a href="#" onClick="showTab('i');return false;"><img src="author_page/images/aqua_tab_right.gif"  width="9" height="22" border="0" id="tab_right_i"  name="tab_right_i"/></a></td>
+	  </tr>
+	</table>
+
+</td>
+  </tr>
+</table>
+
+ <!-- end tab buttons -->
Index: lams_tool_lamc/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/struts-config.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_lamc/web/WEB-INF/struts-config.xml	13 Oct 2005 15:28:37 -0000	1.3
+++ lams_tool_lamc/web/WEB-INF/struts-config.xml	14 Oct 2005 15:50:11 -0000	1.4
@@ -73,6 +73,14 @@
         path=".starter"
         redirect="true"
       />
+      
+      
+      <forward
+        name="editOptsContent"
+        path=".editOptsContent"
+        redirect="true"
+      />
+      
     </action>
  </action-mappings>
 
Index: lams_tool_lamc/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/web.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_lamc/web/WEB-INF/web.xml	12 Oct 2005 16:39:21 -0000	1.4
+++ lams_tool_lamc/web/WEB-INF/web.xml	14 Oct 2005 15:50:11 -0000	1.5
@@ -3,39 +3,38 @@
 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
 
 <web-app >
+ <context-param>
+  	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
+  	<param-value>org.lamsfoundation.lams.tool.mc.web.McResources</param-value>
+</context-param>
 	<context-param>
-	  	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-	  	<param-value>org.lamsfoundation.lams.tool.mc.McResources</param-value>
-	</context-param>
-	<context-param>
 		<param-name>contextConfigLocation</param-name>
 		<param-value>
 			classpath:/org/lamsfoundation/lams/applicationContext.xml
-	    	classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-	    	classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
-	    	classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
+            classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
+            classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
 			classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
+			classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
 			classpath:/org/lamsfoundation/lams/tool/mc/mcApplicationContext.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>mcSessionFactory</param-value>
+    </init-param>
+   </filter>
    <!-- System session filter -->
-   
    <filter>
        <filter-name>SystemSessionFilter</filter-name>
          <filter-class>
@@ -44,44 +43,14 @@
      </filter>
 
     <filter-mapping>
- 	   <filter-name>SystemSessionFilter</filter-name>
-    	 <url-pattern>/*</url-pattern>
-   </filter-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>
@@ -138,48 +107,96 @@
       <session-timeout>120</session-timeout>
    </session-config>
    
-   <taglib>
+     <error-page>
+		<error-code>403</error-code>
+		<location>/403.html</location>
+	</error-page>
+
+  <!-- Struts Tag Library Descriptors -->
+
+<taglib>
     <taglib-uri>fck-editor</taglib-uri>
     <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
-  </taglib>
+</taglib>
 
-   <!--
-   To specify mime mappings, create a file named mime-mappings.xml, put it in your project's mergedir.
-   Organize mime-mappings.xml following this DTD slice:
+  	<!--  Security Constraint -->
+	<security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Secure Content</web-resource-name>
+			<url-pattern>/*</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>LEARNER</role-name>
+    		<role-name>TEACHER</role-name>
+    		<role-name>STAFF</role-name>
+    		<role-name>AUTHOR</role-name>
+    		<role-name>ADMIN</role-name>
+    		<role-name>SYSADMIN</role-name>
+    	</auth-constraint>
+    </security-constraint>
 
-   <!ELEMENT mime-mapping (extension, mime-type)>
-   -->
+   <!--  Security Constraint -->
+	<security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Secure Content</web-resource-name>
+			<url-pattern>/*</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>LEARNER</role-name>
+    		<role-name>TEACHER</role-name>
+    		<role-name>STAFF</role-name>
+    		<role-name>AUTHOR</role-name>
+    		<role-name>ADMIN</role-name>
+    		<role-name>SYSADMIN</role-name>
+    	</auth-constraint>
+    </security-constraint>
 
-   <!--
-   To specify error pages, create a file named error-pages.xml, put it in your project's mergedir.
-   Organize error-pages.xml following this DTD slice:
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Authoring Update</web-resource-name>
+		    <url-pattern>/authoringStarter.do</url-pattern>
+		   <url-pattern>/authoring.do</url-pattern>
+		 </web-resource-collection>
+    	<auth-constraint>
+    		<role-name>AUTHOR</role-name>
+    	</auth-constraint>
+    </security-constraint>
+    
+    
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Staff Content</web-resource-name>
+		    <url-pattern>/monitoringStarter.do</url-pattern>
+		    <url-pattern>/monitoring.do</url-pattern>		   
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>STAFF</role-name>
+    	</auth-constraint>
+    </security-constraint>
 
-   <!ELEMENT error-page ((error-code | exception-type), location)>
-   -->
+    
+	<!--  some combine role security setting -->
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Download Files</web-resource-name>
+		    <url-pattern>/download/</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>AUTHOR</role-name>
+    		<role-name>STAFF</role-name>
+    		<role-name>ADMIN</role-name>
+    		<role-name>SYSADMIN</role-name>
+    	</auth-constraint>
+    </security-constraint>
 
-  <!--
-  To add taglibs by xml, create a file called taglibs.xml and place it
-  in your merge dir.
-  -->
 
-   <!--
-   To set up security settings for your web app, create a file named web-security.xml, put it in your project's mergedir.
-   Organize web-security.xml following this DTD slice:
+	<!--  Login Configuration -->
+  	<login-config>
+   		<auth-method>FORM</auth-method>
+		<realm-name>LAMS</realm-name>
+   		<form-login-config>
+    		<form-login-page>/login.jsp</form-login-page>
+   		</form-login-config>
+   	</login-config>
 
-   <!ELEMENT security-constraint (display-name?, web-resource-collection+, auth-constraint?, user-data-constraint?)>
-   <!ELEMENT web-resource-collection (web-resource-name, description?, url-pattern*, http-method*)>
-   <!ELEMENT web-resource-name (#PCDATA)>
-   <!ELEMENT url-pattern (#PCDATA)>
-   <!ELEMENT http-method (#PCDATA)>
-   <!ELEMENT user-data-constraint (description?, transport-guarantee)>
-   <!ELEMENT transport-guarantee (#PCDATA)>
-
-   <!ELEMENT login-config (auth-method?, realm-name?, form-login-config?)>
-   <!ELEMENT auth-method (#PCDATA)>
-   <!ELEMENT realm-name (#PCDATA)>
-   <!ELEMENT form-login-config (form-login-page, form-error-page)>
-   <!ELEMENT form-login-page (#PCDATA)>
-   <!ELEMENT form-error-page (#PCDATA)>
-   -->
-
 </web-app>
Index: lams_tool_lamc/web/WEB-INF/tiles/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/tiles/Attic/tiles-defs.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_lamc/web/WEB-INF/tiles/tiles-defs.xml	12 Oct 2005 18:55:58 -0000	1.2
+++ lams_tool_lamc/web/WEB-INF/tiles/tiles-defs.xml	14 Oct 2005 15:50:11 -0000	1.3
@@ -47,12 +47,21 @@
 		<put name="pageHeader" value = "Questions for Multiple Choice"/>
 		<put name="content" value="authoringMaincontent.jsp" />	
 	</definition>
-	
+
+	<definition name=".editOptsContent" extends=".baseDef" >
+		<put name="title" value="Edit Content"/>
+		<put name="pageHeader" value = "Edit Content"/>
+		<put name="content" value="editDefaultContent.jsp" />	
+	</definition>
+		
 <!-- ============= Qa Authoring Starter Page Definitions ====================== -->	
 	<definition name=".starter" extends=".baseDef" >
 		<put name="title" value="Starter for Multiple Choice Authoring"/>
 		<put name="pageHeader" value = "Starter for Multiple Choice Authoring"/>
 		<put name="content" value="/index.jsp" />	
 	</definition>
+	
+	
 
+
 </tiles-definitions>
\ No newline at end of file