Index: lams_tool_laqa/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r69f36134758d85e347893150aa05da3ba9479159 -r6582f99968f17e3e54b6f83230f6fe0b67b019e6
--- lams_tool_laqa/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 69f36134758d85e347893150aa05da3ba9479159)
+++ lams_tool_laqa/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 6582f99968f17e3e54b6f83230f6fe0b67b019e6)
@@ -24,7 +24,7 @@
     it in your merge directory.
   -->
 
-<!-- 
+
 <global-exceptions>
       <exception
         key="error.system.qa"
@@ -34,8 +34,8 @@
         scope="request"
       />
 </global-exceptions>
--->
 
+
   <!-- ========== Global Forward Definitions =================================== -->
    <global-forwards>
      <forward name="starter" path="/authoringStarter"/>   
@@ -45,10 +45,7 @@
 
   <!-- ========== Action Mapping Definitions =================================== -->
   <action-mappings>
-   
-	<!--Authoring Starter  -->
-   <!--  action path="/authoringStarter" type="org.lamsfoundation.lams.tool.qa.web.QaStarterAction" 
-   			name="QaAuthoringForm" input=".starter" --> 
+   <!--Authoring Starter  -->
     <action
       path="/authoringStarter"
       type="org.lamsfoundation.lams.tool.qa.web.QaStarterAction"
@@ -59,32 +56,51 @@
     >
         <forward
           name="load"
-          path="/author_page.jsp"
+          path="/AuthoringMaincontent.jsp"
           redirect="false"
         />
+
 	  	<forward
-          name="monitoringReport"
-          path=".monitoringReport"
-          redirect="true"
-   	  	/>
-	  	<forward
 		    name="errorList"
-		    path=".qaErrorBox"
+		    path="/QaErrorBox.jsp"
 		    redirect="true"
 	  	/>
 	</action>  
+	
+	<action
+      path="/authoring"
+      type="org.lamsfoundation.lams.tool.qa.web.QAction"
+      name="QaAuthoringForm"
+      scope="session"
+      input="/AuthoringMaincontent.jsp"
+      parameter="dispatch"
+      unknown="false"
+      validate="true"
+    >
+      	<forward
+	        name="load"
+	        path="/AuthoringMaincontent.jsp"
+	        redirect="true"
+      />
+      	<forward
+	        name="starter"
+	        path=".starter"
+	        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"
+		    name="loadLearner"
+		    path="/learning/answersContent.jsp"
 		    redirect="true"
 		  />
 	  	
 	      <forward
 	        name="learnerReport"
-	        path=".learnerReport"
+	        path="/learning/learnerReport.jsp"
 	        redirect="true"
 	      />
 
@@ -95,117 +111,89 @@
 	      />
 	      
 		<forward
-		    name="errorList"
-		    path=".qaErrorBox"
+		    name="errorListLearner"
+		    path="/QaErrorBox.jsp"
 		    redirect="true"
 	  	/>      
 	</action>  
 	
-    <action
-      path="/authoring"
-      type="org.lamsfoundation.lams.tool.qa.web.QAction"
-      name="QaAuthoringForm"
-      scope="session"
-      input="/author_page.jsp"
-      parameter="dispatch"
-      unknown="false"
-      validate="true"
-    >
-      <forward
-        name="load"
-        path="/author_page.jsp"
-        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="/learning/answersContent.jsp"
+	      parameter="method"
+	      unknown="false"
+	      validate="true">
 
-
- <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="loadLearner"
+		    path="/learning/answersContent.jsp"	        
+		    redirect="true"
+	      />
+	      
+	      <forward
+	        name="learningStarter"
+	        path=".learningStarter"
+	        redirect="true"
+	      />
       
-      <forward
-        name="learnerReport"
-        path=".learnerReport"
-        redirect="true"
-      />
-      
-</action>
+	      <forward
+	        name="learnerReport"
+	        path="/learning/learnerReport.jsp"
+	        redirect="true"
+	      />
+	      
+	      <forward
+		    name="errorListLearner"
+		    path="/QaErrorBox.jsp"
+		    redirect="true"
+	  	/>      
+	</action>
 
+	 <action
+	      path="/monitoring"
+	      type="org.lamsfoundation.lams.tool.qa.web.QaMonitoringAction"
+	      name="QaMonitoringForm"
+	      scope="session"
+	      parameter="dispatch"
+	      unknown="false"
+	      validate="false">
 
-
- <action
-      path="/monitoring"
-      type="org.lamsfoundation.lams.tool.qa.web.QaMonitoringAction"
-      name="QaMonitoringForm"
-      scope="session"
-      parameter="dispatch"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="monitoringReport"
-        path=".monitoringReport"
-        redirect="true"
+     	 <forward
+	        name="monitoringReport"
+	        path=".monitoringReport"
+	        redirect="true"
    	  	/>
 	   	
 	   	<forward
-        name="load"
-        path=".questions"
-        redirect="true"
-      />	
+	        name="load"
+	        path=".questions"
+	        redirect="true"
+	      />	
       
 	   	<forward
-        name="error"
-        path=".error"
-        redirect="true"
-      />	
+	        name="error"
+	        path=".error"
+	        redirect="true"
+      	/>	
+	</action>
 
-</action>
-
-
 <!--Export Portfoloio Starter  -->
- <action
-      path="/exportPortfolioStarter"
-      type="org.lamsfoundation.lams.tool.qa.web.QaExportPortfolioStarterAction"
-      name="QaExportPortfolioForm"
-      scope="session"
-      input=".exportPortfolioStarter"
-    >
+	 <action
+	      path="/exportPortfolioStarter"
+	      type="org.lamsfoundation.lams.tool.qa.web.QaExportPortfolioStarterAction"
+	      name="QaExportPortfolioForm"
+	      scope="session"
+	      input=".exportPortfolioStarter">
+
       	<forward
-        name="portfolioReport"
-        path=".portfolioReport"
-        redirect="true"
-      />	
-    
+	        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. -->