Index: lams_tool_lamc/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r653f0f0eff40af5e6891c22ef2b8efe9bf2f75af -re641617111e90d02c659127046f06b0f5c8e2845
--- lams_tool_lamc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 653f0f0eff40af5e6891c22ef2b8efe9bf2f75af)
+++ lams_tool_lamc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision e641617111e90d02c659127046f06b0f5c8e2845)
@@ -13,9 +13,7 @@
   <!-- ========== Form Bean Definitions =================================== -->
 
 <form-beans>
-	<form-bean name="QaAuthoringForm" type="org.lamsfoundation.lams.tool.qa.web.QaAuthoringForm"/>
-      	<form-bean name="QaLearningForm" type="org.lamsfoundation.lams.tool.qa.web.QaLearningForm"/>
-      	<form-bean name="QaMonitoringForm" type="org.lamsfoundation.lams.tool.qa.web.QaMonitoringForm"/>
+	<form-bean name="McAuthoringForm" type="org.lamsfoundation.lams.tool.mc.web.McAuthoringForm"/>
 </form-beans>
 
   <!-- ========== Global Exceptions Definitions =================================== -->
@@ -27,8 +25,8 @@
 <!-- 
 <global-exceptions>
       <exception
-        key="error.system.qa"
-        type="org.lamsfoundation.lams.tool.qa.QaApplicationException"
+        key="error.system.mc"
+        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
         handler="org.lamsfoundation.lams.util.CustomStrutsExceptionHandler"
         path=".systemError"
         scope="request"
@@ -39,177 +37,24 @@
   <!-- ========== Global Forward Definitions =================================== -->
    <global-forwards>
      <forward name="starter" path="/authoringStarter"/>   
-	  <forward name="learningStarter" path="/learningStarter"/>   
-	  <forward name="monitoringStarter" path="/monitoringStarter"/>   
  </global-forwards>
 
   <!-- ========== Action Mapping Definitions =================================== -->
   <action-mappings>
    
 	<!--Authoring Starter  -->
-   <action path="/authoringStarter" type="org.lamsfoundation.lams.tool.qa.web.QaStarterAction" 
-   			name="QaAuthoringForm" input=".starter"> 
+   <action path="/authoringStarter" type="org.lamsfoundation.lams.tool.mc.web.McStarterAction" 
+   			name="McAuthoringForm" input=".starter"> 
 	  	<forward
 		    name="load"
 		    path=".questions"
 		    redirect="true"
 	  	/>
-	  	<forward
-        name="monitoringReport"
-        path=".monitoringReport"
-        redirect="true"
-   	  	/>
 	</action>  
-	<!--Learning Starter  -->
-   <action path="/learningStarter" type="org.lamsfoundation.lams.tool.qa.web.QaLearningStarterAction" 
-   			name="QaLearningForm" input=".learningStarter"> 
-	  <forward
-	    name="load"
-	    path=".answers"
-	    redirect="true"
-	  />
-	  	
-      <forward
-        name="learnerReport"
-        path=".learnerReport"
-        redirect="true"
-      />
-	  	
-	</action>  
-	<!--Monitoring Starter  -->
-	<action path="/monitoringStarter" type="org.lamsfoundation.lams.tool.qa.web.QaMonitoringStarterAction" 
-   			name="QaMonitoringForm" input=".monitoringStarter"> 
-      <forward
-        name="monitoringReport"
-        path=".monitoringReport"
-        redirect="true"
-   	  	/>
-   	  	
-	   	<forward
-        name="load"
-        path=".questions"
-        redirect="true"
-      />
-      
-       	<forward
-        name="monitoringError"
-        path=".monitoringError"
-        redirect="true"
-      />	
-      
-      
-	</action>  
-
-    <action
-      path="/authoring"
-      type="org.lamsfoundation.lams.tool.qa.web.QAction"
-      name="QaAuthoringForm"
-      scope="session"
-      input=".questions"
-      parameter="method"
-      unknown="false"
-      validate="true"
-    >
-      <forward
-        name="load"
-        path=".questions"
-        redirect="true"
-      />
-      <forward
-        name="starter"
-        path=".starter"
-        redirect="true"
-      />
-      <forward
-        name="monitoringReport"
-        path=".monitoringReport"
-        redirect="true"
-   	  	/>
-    </action>
-
-
- <action
-      path="/learning"
-      type="org.lamsfoundation.lams.tool.qa.web.QAction"
-      name="QaLearningForm"
-      scope="session"
-      input=".answers"
-      parameter="method"
-      unknown="false"
-      validate="true"
-    >
-      <forward
-        name="load"
-        path=".answers"
-        redirect="true"
-      />
-      <forward
-        name="learningStarter"
-        path=".learningStarter"
-        redirect="true"
-      />
-      
-      <forward
-        name="learnerReport"
-        path=".learnerReport"
-        redirect="true"
-      />
-      
-</action>
-
-
-
- <action
-      path="/monitoring"
-      type="org.lamsfoundation.lams.tool.qa.web.QaMonitoringAction"
-      name="QaMonitoringForm"
-      scope="session"
-      input=".monitoringReport"
-      parameter="method"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="monitoringReport"
-        path=".monitoringReport"
-        redirect="true"
-   	  	/>
-	   	
-	   	<forward
-        name="load"
-        path=".questions"
-        redirect="true"
-      />	
-      
-	   	<forward
-        name="error"
-        path=".error"
-        redirect="true"
-      />	
-
-</action>
-
-
-<!--Export Portfoloio Starter  -->
- <action
-      path="/exportPortfolioStarter"
-      type="org.lamsfoundation.lams.tool.qa.web.QaExportPortfolioStarterAction"
-      name="QaExportPortfolioForm"
-      scope="session"
-      input=".exportPortfolioStarter"
-    >
-      	<forward
-        name="portfolioReport"
-        path=".portfolioReport"
-        redirect="true"
-      />	
-    
- </action>
-
  </action-mappings>
 
   <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
- <message-resources parameter="org.lamsfoundation.lams.tool.qa.QaResources"/>
+ <message-resources parameter="org.lamsfoundation.lams.tool.mc.McResources"/>
 
 <!-- StrutsTestCase doesn't support tile well at the moment, Have to be 
 commented out for testing-->