Index: lams_tool_lamc/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r638795e63a09fe10a694f8607e21ce2f81cb937b -r8522cd628329e0031e21b48f2750b1fd9b1842a6
--- lams_tool_lamc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 638795e63a09fe10a694f8607e21ce2f81cb937b)
+++ lams_tool_lamc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 8522cd628329e0031e21b48f2750b1fd9b1842a6)
@@ -26,119 +26,123 @@
 	
   <!-- ========== Action Mapping Definitions =================================== -->
   <action-mappings>
-	<!--Authoring Starter Action: initializes the authoring module -->
-   <action path="/authoringStarter" 
-   			type="org.lamsfoundation.lams.tool.mc.web.McStarterAction" 
-   			name="McAuthoringForm" 
-	      	scope="session"
-   			input="/index.jsp"> 
-	  	<forward
-		    name="load"
-		    path="/authoring/AuthoringMaincontent.jsp"
-		    redirect="true"
-	  	/>
+   <!--Authoring Starter  -->
+    <action
+		path="/authoringStarter"
+		type="org.lamsfoundation.lams.tool.mc.web.McStarterAction"
+		name="McAuthoringForm"
+		scope="request"
+		unknown="false"
+		validate="false"
+    >
 
-	  	<forward
-		    name="loadMonitoring"
-		    path="/monitoring/MonitoringMaincontent.jsp"
-		    redirect="true"
-	  	/>
+	    <forward
+			name="load"
+			path="/AuthoringMaincontent.jsp"
+			redirect="false"
+	    />
+	
+	    <forward
+			name="loadViewOnly"
+	      	path="/authoring/AuthoringTabsHolder.jsp"
+	      	redirect="false"
+	    />
 
 	  	<forward
-		    name="loadMonitoringEditActivity"
-		    path="/monitoring/MonitoringMaincontent.jsp"
-		    redirect="true"
+			name="loadMonitoring"
+			path="/monitoring/MonitoringMaincontent.jsp"
+			redirect="false"
 	  	/>
-	  	
+	
 	  	<forward
-		    name="loadLearner"
-		    path="/learning/AnswersContent.jsp"
-		    redirect="true"
+			name="refreshMonitoring"
+			path="/monitoring/MonitoringMaincontent.jsp"
+			redirect="false"
 	  	/>
-
+	
+	</action>  
+	
+	<action
+      path="/authoring"
+      type="org.lamsfoundation.lams.tool.mc.web.McAction"
+      name="McAuthoringForm"
+      input="/AuthoringMaincontent.jsp"
+      parameter="dispatch"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+    
 	  	<forward
-	        name="starter"
-	        path="/index.jsp"
-		    redirect="true"
-	     />
-	     
-	     <forward
-	        name="preview"
-	        path="/learning/Preview.jsp"
-		    redirect="true"
-	     />
-	  	
+	        name="load"
+	        path="/AuthoringMaincontent.jsp"
+	        redirect="false"
+		/>
+	
 	  	<forward
-		    name="errorList"
-		    path="/McErrorBox.jsp"
-		    redirect="true"
+			name="loadMonitoring"
+			path="/monitoring/MonitoringMaincontent.jsp"
+			redirect="false"
 	  	/>
-	</action>  
 	
-
-	<!--Authoring Main Action : interacts with the authoring module user-->
-	<action path="/authoring"
-	      	type="org.lamsfoundation.lams.tool.mc.web.McAction"
-    	  	name="McAuthoringForm"
-	      	scope="session"
-    	  	input="/authoring/AuthoringMaincontent.jsp"
-      		parameter="dispatch">
-	      <forward
-	        name="load"
-	        path="/authoring/AuthoringMaincontent.jsp"
-		    redirect="true"
-	      />
-	    
-	      <forward
-	        name="starter"
-	        path="/index.jsp"
-		    redirect="true"
-	      />
-	      
 	  	<forward
-		    name="loadMonitoring"
+		    name="refreshMonitoring"
 		    path="/monitoring/MonitoringMaincontent.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
-	  	
-	     <forward
-	        name="preview"
-	        path="/learning/Preview.jsp"
-		    redirect="true"
-	     />
-	  	
+	  
+	    <forward
+			name="loadViewOnly"
+			path="/authoring/AuthoringTabsHolder.jsp"
+			redirect="false"
+	    />
+	    
+	    <forward
+			name="newQuestionBox"
+			path="/authoring/newQuestionBox.jsp"
+			redirect="false"
+	    />
+
+	    <forward
+			name="editQuestionBox"
+			path="/authoring/editQuestionBox.jsp"
+			redirect="false"
+	    />
+
+
 	  	<forward
-		    name="errorList"
-		    path="/McErrorBox.jsp"
-		    redirect="true"
+	        name="starter"
+	        path="/index.jsp"
+	        redirect="false"
 	  	/>
-	      
-    </action>
+  </action>
     
-    
    <!--Define Later Starter Action: initializes the DefineLater module -->
-   <action path="/defineLaterStarter" 
-   			type="org.lamsfoundation.lams.tool.mc.web.McDLStarterAction" 
-   			name="McAuthoringForm" 
-   			input="/index.jsp"> 
+   <action 
+   	path="/defineLaterStarter" 
+   	type="org.lamsfoundation.lams.tool.mc.web.McDLStarterAction" 
+   	name="McAuthoringForm" 
+	scope="request"
+   	input="/index.jsp"> 
 
 	  	<forward
 		    name="load"
-		    path="/authoring/AuthoringMaincontent.jsp"
-		    redirect="true"
+          	path="/AuthoringMaincontent.jsp"
+		    redirect="false"
 	  	/>
 	  	
 	  	<forward
 	        name="starter"
 	        path="/index.jsp"
-		    redirect="true"
+	        redirect="false"
 	     />
+	  
+        <forward
+          name="loadViewOnly"
+          path="/authoring/AuthoringTabsHolder.jsp"
+          redirect="false"
+        />
 	  	
-	  	<forward
-		    name="errorList"
-		    path="/McErrorBox.jsp"
-		    redirect="true"
-	  	/>
 	</action>  
     
 
@@ -284,34 +288,29 @@
     <!--Monitoring Starter Action: initializes the Monitoring module -->
    <action 	path="/monitoringStarter" 
    			type="org.lamsfoundation.lams.tool.mc.web.McMonitoringStarterAction" 
-	      	scope="session"
+	      	scope="request"
    			name="McMonitoringForm" 
       		unknown="false"
       		validate="false"
    			input="/monitoringIndex.jsp"> 
 
 	  	<forward
-		    name="loadMonitoring"
-		    path="/monitoring/MonitoringMaincontent.jsp"
-		    redirect="true"
+			name="loadMonitoring"
+			path="/monitoring/MonitoringMaincontent.jsp"
+			redirect="false"
 	  	/>
-	  	
-       <forward
-	        name="load"
-	        path="/authoring/AuthoringMaincontent.jsp"
-		    redirect="true"
-	    />
-	    
-	    <forward
-	        name="starter"
-	        path="/index.jsp"
-		    redirect="true"
-	     />
-
+	
 	  	<forward
+			name="refreshMonitoring"
+			path="/monitoring/MonitoringMaincontent.jsp"
+			redirect="false"
+	  	/>
+	         			
+   			
+	  	<forward
 		    name="errorList"
-		    path="/McErrorBox.jsp"
-		    redirect="true"
+	        path="/McErrorBox.jsp"
+		    redirect="false"
 	  	/>
 	</action>  
     
@@ -320,57 +319,63 @@
    <action 	path="/monitoring" 
    			type="org.lamsfoundation.lams.tool.mc.web.McMonitoringAction" 
    			name="McMonitoringForm" 
-	      	scope="session"
+	      	scope="request"
    			input="/monitoring/MonitoringMaincontent.jsp"
-      		parameter="method"
+      		parameter="dispatch"
       		unknown="false"
       		validate="false"> 
-      		
+	      
 	  	<forward
-		    name="loadMonitoring"
-		    path="/monitoring/MonitoringMaincontent.jsp"
-		    redirect="true"
+			name="loadMonitoring"
+			path="/monitoring/MonitoringMaincontent.jsp"
+			redirect="false"
 	  	/>
-	  	
+
 	  	<forward
-		    name="MonitoringContent"
+		    name="loadMonitoringEditActivity"
 		    path="/monitoring/MonitoringMaincontent.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
-	  	
-	  	
+	
 	  	<forward
-		    name="loadMonitoringEditActivity"
-		    path="/monitoring/MonitoringMaincontent.jsp"
-		    redirect="true"
+			name="refreshMonitoring"
+			path="/monitoring/MonitoringMaincontent.jsp"
+			redirect="false"
 	  	/>
-	  	
-       <forward
-	        name="load"
-	        path="/authoring/AuthoringMaincontent.jsp"
-		    redirect="true"
-	    />
-	    
-	    <forward
-	        name="starter"
-	        path="/index.jsp"
-		    redirect="true"
-	     />
-	     
+
+
         <forward
           name="learnerNotebook"
           path="/monitoring/LearnerNotebook.jsp"
           redirect="false"
         />
-	     
 
+
+	    <forward
+			name="newQuestionBox"
+			path="/monitoring/newQuestionBox.jsp"
+			redirect="false"
+	    />
+
+	    <forward
+			name="editQuestionBox"
+			path="/monitoring/editQuestionBox.jsp"
+			redirect="false"
+	    />
+
+
 	  	<forward
 		    name="errorList"
-		    path="/McErrorBox.jsp"
-		    redirect="true"
+	        path="/McErrorBox.jsp"
+		    redirect="false"
 	  	/>
 	</action>  
+	
+   <action 	path="/clearsession" 
+   			type="org.lamsfoundation.lams.tool.mc.web.ClearSessionAction"> 
+	</action>     			
 
+
 	<action path="/clearsession"
 		type="org.lamsfoundation.lams.tool.mc.web.ClearSessionAction">
 	</action>