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.84 -r1.85
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	15 Jan 2006 13:42:18 -0000	1.84
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	15 Jan 2006 16:38:02 -0000	1.85
@@ -67,34 +67,51 @@
  * <code>CustomStrutsExceptionHandler<code>.
  * 
  
-		<action
-      path="/authoring"
-      type="org.lamsfoundation.lams.tool.mc.web.McAction"
-      name="McAuthoringForm"
-      scope="session"
-      input=".questions"
-      parameter="dispatch"
-      unknown="false"
-      validate="true"
-    >
-      <forward
-        name="load"
-        path=".questions"
-        redirect="true"
-      />
-    
-      <forward
-        name="starter"
-        path=".starter"
-        redirect="true"
-      />
-      
-      <forward
-        name="editOptsContent"
-        path=".editOptsContent"
-        redirect="true"
-      />
+	<!--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=".questions"
+      		parameter="dispatch"
+      		unknown="false"
+      		validate="true">
+	
+		<exception
+	        key="error.exception.McApplication"
+	        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
+	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
+	        path=".mcErrorBox"
+	        scope="request"
+	      />
+
+		<exception
+	        key="error.exception.McApplication"
+	        type="java.lang.NullPointerException"
+	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
+	        path=".mcErrorBox"
+	        scope="request"
+	      />	         			      		
+    	
+	      <forward
+	        name="load"
+	        path=".questions"
+	        redirect="true"
+	      />
+	    
+	      <forward
+	        name="starter"
+	        path=".starter"
+	        redirect="true"
+	      />
+	      
+	      <forward
+	        name="editOptsContent"
+	        path=".editOptsContent"
+	        redirect="true"
+	      />
     </action>
+
 */
 public class McAction extends LamsDispatchAction implements McAppConstants
 {
@@ -268,7 +285,6 @@
 		Map mapGeneralSelectedOptionsContent=(Map)request.getSession().getAttribute(MAP_GENERAL_SELECTED_OPTIONS_CONTENT);
 		logger.debug("mapGeneralSelectedOptionsContent " +  mapGeneralSelectedOptionsContent);
 		
-		
 		logger.debug("sequencing final maps...");
 		mapGeneralOptionsContent=AuthoringUtil.sequenceMap(mapGeneralOptionsContent);
 		logger.debug("sequenced mapGeneralOptionsContent:"+ mapGeneralOptionsContent);
@@ -2195,17 +2211,32 @@
      * @throws IOException
      * @throws ServletException
 
-	<action
-      path="/learning"
-      type="org.lamsfoundation.lams.tool.mc.web.McAction"
-      name="McLearningForm"
-      scope="session"
-      input=".answers"
-      parameter="method"
-      unknown="false"
-      validate="true"
-    >
+   <!--Learning Main Action: interacts with the Learning module user -->
+	<action	path="/learning"
+		    type="org.lamsfoundation.lams.tool.mc.web.McAction"
+			name="McLearningForm"
+      		scope="session"
+      		input=".answers"
+      		parameter="method"
+      		unknown="false"
+      		validate="true">
+	
+		<exception
+	        key="error.exception.McApplication"
+	        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
+	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
+	        path=".mcErrorBox"
+	        scope="request"
+	      />
 
+		<exception
+	        key="error.exception.McApplication"
+	        type="java.lang.NullPointerException"
+	        handler="org.lamsfoundation.lams.tool.mc.web.CustomStrutsExceptionHandler"
+	        path=".mcErrorBox"
+	        scope="request"
+	      />	         			      		
+
 	  	<forward
 		    name="loadLearner"
 		    path=".answers"
@@ -2231,31 +2262,17 @@
 	  	/>
 
 	  	<forward
-		    name="viewSummary"
-		    path=".viewSummary"
-		    redirect="true"
-	  	/>
-	  	
-	  	<forward
-		    name="singleQuestionAnswers"
-		    path=".singleQuestionAnswers"
-		    redirect="true"
-	  	/>
-
-	  	<forward
 		    name="resultsSummary"
 		    path=".resultsSummary"
 		    redirect="true"
 	  	/>
 
 	  	<forward
 		    name="errorList"
-		    path=".errorList"
+		    path=".mcErrorBox"
 		    redirect="true"
 	  	/>
-
-     * </action>
-     *  responds to learner activity in learner mode.
+    </action>
      * 
      * ActionForward displayMc(ActionMapping mapping,
             ActionForm form,