Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml
===================================================================
diff -u -r5f80d71e39cb040460d57e45cf7f94b34204f1b3 -rc36523c3640d5bda32e4b738383c2595ca9603cf
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml	(.../McQueContent.hbm.xml)	(revision 5f80d71e39cb040460d57e45cf7f94b34204f1b3)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml	(.../McQueContent.hbm.xml)	(revision c36523c3640d5bda32e4b738383c2595ca9603cf)
@@ -39,6 +39,17 @@
     >
     </property>
     
+    <property
+        name="mcContentId"
+        type="java.lang.Long"
+        column="mc_content_id"
+        not-null="true"
+   	    update="false"
+	    insert="false"
+        length="20"
+    >
+    </property>
+    
     <many-to-one
         name="mcContent"
         class="org.lamsfoundation.lams.tool.mc.McContent"
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml
===================================================================
diff -u -r5f80d71e39cb040460d57e45cf7f94b34204f1b3 -rc36523c3640d5bda32e4b738383c2595ca9603cf
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml	(.../McQueContent.hbm.xml)	(revision 5f80d71e39cb040460d57e45cf7f94b34204f1b3)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml	(.../McQueContent.hbm.xml)	(revision c36523c3640d5bda32e4b738383c2595ca9603cf)
@@ -39,6 +39,17 @@
     >
     </property>
     
+    <property
+        name="mcContentId"
+        type="java.lang.Long"
+        column="mc_content_id"
+        not-null="true"
+   	    update="false"
+	    insert="false"
+        length="20"
+    >
+    </property>
+    
     <many-to-one
         name="mcContent"
         class="org.lamsfoundation.lams.tool.mc.McContent"
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java
===================================================================
diff -u -rb7e4d4f379a4a90d25f4af4a5d421310cb6bf8e3 -rc36523c3640d5bda32e4b738383c2595ca9603cf
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java	(.../McQueContent.java)	(revision b7e4d4f379a4a90d25f4af4a5d421310cb6bf8e3)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java	(.../McQueContent.java)	(revision c36523c3640d5bda32e4b738383c2595ca9603cf)
@@ -44,7 +44,10 @@
 
     /** nullable persistent field */
     private Integer displayOrder;
-
+    
+    /** non persistent field */
+    private Long mcContentId;
+    
     /** persistent field */
     private org.lamsfoundation.lams.tool.mc.McContent mcContent;
     
@@ -189,4 +192,16 @@
             .toString();
     }
 	
+	/**
+	 * @return Returns the mcContentId.
+	 */
+	public Long getMcContentId() {
+		return mcContentId;
+	}
+	/**
+	 * @param mcContentId The mcContentId to set.
+	 */
+	public void setMcContentId(Long mcContentId) {
+		this.mcContentId = mcContentId;
+	}
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
diff -u -rb7e4d4f379a4a90d25f4af4a5d421310cb6bf8e3 -rc36523c3640d5bda32e4b738383c2595ca9603cf
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision b7e4d4f379a4a90d25f4af4a5d421310cb6bf8e3)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision c36523c3640d5bda32e4b738383c2595ca9603cf)
@@ -1177,7 +1177,6 @@
 
     public McQueContent getToolDefaultQuestionContent(long contentId) throws McApplicationException
     {
-    	logger.debug("before attempting retrieving McQueContent with contentId : " + contentId);
     	McQueContent mcQueContent=mcQueContentDAO.getToolDefaultQuestionContent(contentId);
     	logger.debug("retrieved mcQueContent : " + mcQueContent);
     	return mcQueContent; 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
===================================================================
diff -u -re641617111e90d02c659127046f06b0f5c8e2845 -rc36523c3640d5bda32e4b738383c2595ca9603cf
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision e641617111e90d02c659127046f06b0f5c8e2845)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision c36523c3640d5bda32e4b738383c2595ca9603cf)
@@ -1,5 +1,5 @@
 /**
- * @author oxgurd
+ * @author ozgurd
  * 
  * Created on 12/10/2005
  * 
@@ -131,26 +131,55 @@
 			if (contentId == 0) 
 			{
 				logger.debug("default content id has not been setup");
+				request.setAttribute(USER_EXCEPTION_DEFAULTCONTENT_NOTSETUP, new Boolean(true));
 				persistError(request,"error.defaultContent.notSetup");
-		    	request.setAttribute(USER_EXCEPTION_DEFAULTCONTENT_NOTSETUP, new Boolean(true));
 				return (mapping.findForward(LOAD_QUESTIONS));	
 			}
 		}
 		catch(Exception e)
 		{
 			logger.debug("error getting the default content id: " + e.getMessage());
+			request.setAttribute(USER_EXCEPTION_DEFAULTCONTENT_NOTSETUP, new Boolean(true));
 			persistError(request,"error.defaultContent.notSetup");
-	    	request.setAttribute(USER_EXCEPTION_DEFAULTCONTENT_NOTSETUP, new Boolean(true));
 			return (mapping.findForward(LOAD_QUESTIONS));
 		}
 
+		
 		/**
-		 * retrieve the default question content id based on default content id determined above
+		 * retrieve uid of the content based on default content id determined above
 		 */
+		long contentUID=0;
 		try
 		{
-			logger.debug("retrieve the default question content based on default contentId: " + contentId);
-			McQueContent mcQueContent=mcService.getToolDefaultQuestionContent(contentId);
+			logger.debug("retrieve uid of the content based on default content id determined above: " + contentId);
+			McContent mcContent=mcService.retrieveMc(new Long(contentId));
+			if (mcContent == null)
+			{
+				logger.debug("Exception occured: No default content");
+	    		request.setAttribute(USER_EXCEPTION_DEFAULTCONTENT_NOTSETUP, new Boolean(true));
+	    		persistError(request,"error.defaultContent.notSetup");
+				return (mapping.findForward(LOAD_QUESTIONS));
+			}
+			logger.debug("using mcContent: " + mcContent);
+			logger.debug("using mcContent uid: " + mcContent.getUid());
+			contentUID=mcContent.getUid().longValue();
+		}
+		catch(Exception e)
+		{
+			logger.debug("Exception occured: No default question content");
+			request.setAttribute(USER_EXCEPTION_DEFAULTCONTENT_NOTSETUP, new Boolean(true));
+    		persistError(request,"error.defaultContent.notSetup");
+			return (mapping.findForward(LOAD_QUESTIONS));
+		}
+		
+		
+		/**
+		 * retrieve the default question content id based on default content UID determined above
+		 */
+		try
+		{
+			logger.debug("retrieve the default question content based on default content UID: " + contentId);
+			McQueContent mcQueContent=mcService.getToolDefaultQuestionContent(contentUID);
 			logger.debug("using mcQueContent: " + mcQueContent);
 			if (mcQueContent == null)
 			{
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java
===================================================================
diff -u -re641617111e90d02c659127046f06b0f5c8e2845 -rc36523c3640d5bda32e4b738383c2595ca9603cf
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java	(.../McDataAccessTestCase.java)	(revision e641617111e90d02c659127046f06b0f5c8e2845)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java	(.../McDataAccessTestCase.java)	(revision c36523c3640d5bda32e4b738383c2595ca9603cf)
@@ -81,6 +81,7 @@
     }
     
     
+    /*
     public void testInitDB()
     {
     	//create new mc content
@@ -127,5 +128,6 @@
      	McOptsContent mcOptionsContent3= new McOptsContent(new Long(999), false, "yellow", mcQueContent1, new HashSet());
      	mcOptionsContentDAO.saveMcOptionsContent(mcOptionsContent3);
    }
+   */
     
 }
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml
===================================================================
diff -u -r5f80d71e39cb040460d57e45cf7f94b34204f1b3 -rc36523c3640d5bda32e4b738383c2595ca9603cf
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml	(.../McQueContent.hbm.xml)	(revision 5f80d71e39cb040460d57e45cf7f94b34204f1b3)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml	(.../McQueContent.hbm.xml)	(revision c36523c3640d5bda32e4b738383c2595ca9603cf)
@@ -39,6 +39,17 @@
     >
     </property>
     
+    <property
+        name="mcContentId"
+        type="java.lang.Long"
+        column="mc_content_id"
+        not-null="true"
+   	    update="false"
+	    insert="false"
+        length="20"
+    >
+    </property>
+    
     <many-to-one
         name="mcContent"
         class="org.lamsfoundation.lams.tool.mc.McContent"
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java
===================================================================
diff -u -r5f80d71e39cb040460d57e45cf7f94b34204f1b3 -rc36523c3640d5bda32e4b738383c2595ca9603cf
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java	(.../TestMcOptionsContent.java)	(revision 5f80d71e39cb040460d57e45cf7f94b34204f1b3)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java	(.../TestMcOptionsContent.java)	(revision c36523c3640d5bda32e4b738383c2595ca9603cf)
@@ -38,7 +38,7 @@
     }
     
     	
-    
+
     public void testCreateMcOptionsContent()
     {
     	McQueContent mcQueContent = mcQueContentDAO.getMcQueContentByUID(new Long(1));
@@ -51,7 +51,9 @@
     	McOptsContent mcOptionsContent3= new McOptsContent(new Long(999), false, "yellow", mcQueContent, new HashSet());
     	mcOptionsContentDAO.saveMcOptionsContent(mcOptionsContent3);
     }
+
     
+    
 }
 
 
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueContent.java
===================================================================
diff -u -r5f80d71e39cb040460d57e45cf7f94b34204f1b3 -rc36523c3640d5bda32e4b738383c2595ca9603cf
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueContent.java	(.../TestMcQueContent.java)	(revision 5f80d71e39cb040460d57e45cf7f94b34204f1b3)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueContent.java	(.../TestMcQueContent.java)	(revision c36523c3640d5bda32e4b738383c2595ca9603cf)
@@ -37,7 +37,7 @@
         super(name);
     }
     
-    
+    /*
     public void testCreateMcQueContent()
     {
     	McContent mcContent = mcContentDAO.findMcContentById(new Long(2));
@@ -89,5 +89,12 @@
     	mcQueContent.setDisplayOrder(new Integer(88));
     	mcQueContentDAO.saveMcQueContent(mcQueContent);
     }
+    */
     
+    public void testGetToolDefaultQuestionContent()
+    {
+    	McQueContent mcQueContent = mcQueContentDAO.getToolDefaultQuestionContent(new Long(1).longValue());
+    	System.out.print("mcQueContent:" + mcQueContent);
+    }
+    
 }
\ No newline at end of file
Index: lams_tool_lamc/test/web/WEB-INF/struts-config.xml
===================================================================
diff -u -re641617111e90d02c659127046f06b0f5c8e2845 -rc36523c3640d5bda32e4b738383c2595ca9603cf
--- lams_tool_lamc/test/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision e641617111e90d02c659127046f06b0f5c8e2845)
+++ lams_tool_lamc/test/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision c36523c3640d5bda32e4b738383c2595ca9603cf)
@@ -13,7 +13,9 @@
   <!-- ========== Form Bean Definitions =================================== -->
 
 <form-beans>
-	<form-bean name="McAuthoringForm" type="org.lamsfoundation.lams.tool.mc.web.McAuthoringForm"/>
+	<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-beans>
 
   <!-- ========== Global Exceptions Definitions =================================== -->
@@ -25,8 +27,8 @@
 <!-- 
 <global-exceptions>
       <exception
-        key="error.system.mc"
-        type="org.lamsfoundation.lams.tool.mc.McApplicationException"
+        key="error.system.qa"
+        type="org.lamsfoundation.lams.tool.qa.QaApplicationException"
         handler="org.lamsfoundation.lams.util.CustomStrutsExceptionHandler"
         path=".systemError"
         scope="request"
@@ -37,20 +39,173 @@
   <!-- ========== 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.mc.web.McStarterAction" 
-   			name="McAuthoringForm" input=".starter"> 
+   <action path="/authoringStarter" type="org.lamsfoundation.lams.tool.qa.web.QaStarterAction" 
+   			name="QaAuthoringForm" 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. -->
Index: lams_tool_lamc/test/web/WEB-INF/tiles/tiles-defs.xml
===================================================================
diff -u -rca5b61179fb4a48b6d02a869fdcd515f0335ea3c -rc36523c3640d5bda32e4b738383c2595ca9603cf
--- lams_tool_lamc/test/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision ca5b61179fb4a48b6d02a869fdcd515f0335ea3c)
+++ lams_tool_lamc/test/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision c36523c3640d5bda32e4b738383c2595ca9603cf)
@@ -43,69 +43,16 @@
 
 <!-- ============= Qa Authoring Page Definitions ====================== -->	
 	<definition name=".questions" extends=".baseDef" >
-		<put name="title" value="Questions for Q/A"/>
-		<put name="pageHeader" value = "Questions for Q/A"/>
-		<put name="content" value="/questionsContent.jsp" />	
+		<put name="title" value="Questions for Multiple Choice"/>
+		<put name="pageHeader" value = "Questions for Multiple Choice"/>
+		<put name="content" value="authoringMaincontent.jsp" />	
 	</definition>
 	
 <!-- ============= Qa Authoring Starter Page Definitions ====================== -->	
 	<definition name=".starter" extends=".baseDef" >
-		<put name="title" value="Starter for Q/A Authoring"/>
-		<put name="pageHeader" value = "Starter for Q/A Authoring"/>
+		<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>
-	
-<!-- ============= Qa Learning Page Definitions ====================== -->	
-	<definition name=".answers" extends=".baseDef" >
-		<put name="title" value="Answers for Q/A"/>
-		<put name="pageHeader" value = "Answers for Q/A"/>
-		<put name="content" value="/answersContent.jsp" />	
-	</definition>
-	
-<!-- ============= Qa Learning Starter Page Definitions ====================== -->	
-	<definition name=".learningStarter" extends=".baseDef" >
-		<put name="title" value="Starter for Q/A Learning"/>
-		<put name="pageHeader" value = "Starter for Q/A Learning"/>
-		<put name="content" value="/learnerIndex.jsp" />	
-	</definition>
-	
-	<definition name=".learnerReport" extends=".baseDef" >
-		<put name="title" value="Learner Report"/>
-		<put name="pageHeader" value = "Learner Report"/>
-		<put name="content" value="/learnerReport.jsp" />	
-	</definition>
 
-	<definition name=".monitoringReport" extends=".baseDef" >
-		<put name="title" value="Monitoring Report"/>
-		<put name="pageHeader" value = "Monitoring Report"/>
-		<put name="content" value="/monitoringReport.jsp" />	
-	</definition>
-
-	<definition name=".monitoringError" extends=".baseDef" >
-		<put name="title" value="Monitoring Error"/>
-		<put name="pageHeader" value = "Monitoring Error"/>
-		<put name="content" value="/monitoringErrorScreen.jsp" />	
-	</definition>
-
-
-	<definition name=".exportPortfolioStarter" extends=".baseDef" >
-		<put name="title" value="Starter for Q/A Export Portfolio"/>
-		<put name="pageHeader" value = "Starter for Q/A Export Portfolio"/>
-		<put name="content" value="/exportPortfolioIndex.jsp" />	
-	</definition>
-
-	<definition name=".portfolioReport" extends=".baseDef" >
-		<put name="title" value="Portfolio Report"/>
-		<put name="pageHeader" value = "Portfolio Report"/>
-		<put name="content" value="/portfolioReport.jsp" />	
-	</definition>
-
-
-<!-- ============= Qa Monitoring Starter Page Definitions ====================== -->	
-	<definition name=".monitoringStarter" extends=".baseDef" >
-		<put name="title" value="Starter for Q/A Monitoring"/>
-		<put name="pageHeader" value = "Starter for Q/A Monitoring"/>
-		<put name="content" value="/monitoringIndex.jsp" />	
-	</definition>
-
 </tiles-definitions>
\ No newline at end of file
Index: lams_tool_lamc/test/web/WEB-INF/web.xml
===================================================================
diff -u -rb7e4d4f379a4a90d25f4af4a5d421310cb6bf8e3 -rc36523c3640d5bda32e4b738383c2595ca9603cf
--- lams_tool_lamc/test/web/WEB-INF/web.xml	(.../web.xml)	(revision b7e4d4f379a4a90d25f4af4a5d421310cb6bf8e3)
+++ lams_tool_lamc/test/web/WEB-INF/web.xml	(.../web.xml)	(revision c36523c3640d5bda32e4b738383c2595ca9603cf)
@@ -35,6 +35,7 @@
 	    <url-pattern>/portfolioExport</url-pattern>
 	</filter-mapping> -->
    <!-- System session filter -->
+   
    <filter>
        <filter-name>SystemSessionFilter</filter-name>
          <filter-class>
@@ -46,19 +47,7 @@
  	   <filter-name>SystemSessionFilter</filter-name>
     	 <url-pattern>/*</url-pattern>
    </filter-mapping>	
-   
-   <!--  Servlet defination -->
-	<servlet>
-		<servlet-name>exportPortfolio</servlet-name>
-		<display-name>Export Portfolio</display-name>
-		<description>Export Portfolio</description>		
-		<servlet-class>org.lamsfoundation.lams.tool.qa.web.QaExportServlet</servlet-class>
-	</servlet>
 	
-	<servlet-mapping>
-		<servlet-name>exportPortfolio</servlet-name>
-		<url-pattern>/portfolioExport</url-pattern>
-  	</servlet-mapping>
 
     <!--
     To use non XDoclet filters, create a filters.xml file that
Fisheye: Tag c36523c3640d5bda32e4b738383c2595ca9603cf refers to a dead (removed) revision in file `lams_tool_lamc/web/CombinedAnswersContent.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c36523c3640d5bda32e4b738383c2595ca9603cf refers to a dead (removed) revision in file `lams_tool_lamc/web/MonitoringErrorScreen.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c36523c3640d5bda32e4b738383c2595ca9603cf refers to a dead (removed) revision in file `lams_tool_lamc/web/MonitoringInstructionsScreen.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c36523c3640d5bda32e4b738383c2595ca9603cf refers to a dead (removed) revision in file `lams_tool_lamc/web/MonitoringStatsScreen.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c36523c3640d5bda32e4b738383c2595ca9603cf refers to a dead (removed) revision in file `lams_tool_lamc/web/MonitoringSummaryScreen.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c36523c3640d5bda32e4b738383c2595ca9603cf refers to a dead (removed) revision in file `lams_tool_lamc/web/SequentialAnswersContent.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_lamc/web/WEB-INF/tiles/tiles-defs.xml
===================================================================
diff -u -r653f0f0eff40af5e6891c22ef2b8efe9bf2f75af -rc36523c3640d5bda32e4b738383c2595ca9603cf
--- lams_tool_lamc/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision 653f0f0eff40af5e6891c22ef2b8efe9bf2f75af)
+++ lams_tool_lamc/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision c36523c3640d5bda32e4b738383c2595ca9603cf)
@@ -43,69 +43,16 @@
 
 <!-- ============= Qa Authoring Page Definitions ====================== -->	
 	<definition name=".questions" extends=".baseDef" >
-		<put name="title" value="Questions for Q/A"/>
-		<put name="pageHeader" value = "Questions for Q/A"/>
-		<put name="content" value="/questionsContent.jsp" />	
+		<put name="title" value="Questions for Multiple Choice"/>
+		<put name="pageHeader" value = "Questions for Multiple Choice"/>
+		<put name="content" value="authoringMaincontent.jsp" />	
 	</definition>
 	
 <!-- ============= Qa Authoring Starter Page Definitions ====================== -->	
 	<definition name=".starter" extends=".baseDef" >
-		<put name="title" value="Starter for Q/A Authoring"/>
-		<put name="pageHeader" value = "Starter for Q/A Authoring"/>
+		<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>
-	
-<!-- ============= Qa Learning Page Definitions ====================== -->	
-	<definition name=".answers" extends=".baseDef" >
-		<put name="title" value="Answers for Q/A"/>
-		<put name="pageHeader" value = "Answers for Q/A"/>
-		<put name="content" value="/answersContent.jsp" />	
-	</definition>
-	
-<!-- ============= Qa Learning Starter Page Definitions ====================== -->	
-	<definition name=".learningStarter" extends=".baseDef" >
-		<put name="title" value="Starter for Q/A Learning"/>
-		<put name="pageHeader" value = "Starter for Q/A Learning"/>
-		<put name="content" value="/learnerIndex.jsp" />	
-	</definition>
-	
-	<definition name=".learnerReport" extends=".baseDef" >
-		<put name="title" value="Learner Report"/>
-		<put name="pageHeader" value = "Learner Report"/>
-		<put name="content" value="/learnerReport.jsp" />	
-	</definition>
 
-	<definition name=".monitoringReport" extends=".baseDef" >
-		<put name="title" value="Monitoring Report"/>
-		<put name="pageHeader" value = "Monitoring Report"/>
-		<put name="content" value="/monitoringReport.jsp" />	
-	</definition>
-
-	<definition name=".monitoringError" extends=".baseDef" >
-		<put name="title" value="Monitoring Error"/>
-		<put name="pageHeader" value = "Monitoring Error"/>
-		<put name="content" value="/monitoringErrorScreen.jsp" />	
-	</definition>
-
-
-	<definition name=".exportPortfolioStarter" extends=".baseDef" >
-		<put name="title" value="Starter for Q/A Export Portfolio"/>
-		<put name="pageHeader" value = "Starter for Q/A Export Portfolio"/>
-		<put name="content" value="/exportPortfolioIndex.jsp" />	
-	</definition>
-
-	<definition name=".portfolioReport" extends=".baseDef" >
-		<put name="title" value="Portfolio Report"/>
-		<put name="pageHeader" value = "Portfolio Report"/>
-		<put name="content" value="/portfolioReport.jsp" />	
-	</definition>
-
-
-<!-- ============= Qa Monitoring Starter Page Definitions ====================== -->	
-	<definition name=".monitoringStarter" extends=".baseDef" >
-		<put name="title" value="Starter for Q/A Monitoring"/>
-		<put name="pageHeader" value = "Starter for Q/A Monitoring"/>
-		<put name="content" value="/monitoringIndex.jsp" />	
-	</definition>
-
 </tiles-definitions>
\ No newline at end of file
Fisheye: Tag c36523c3640d5bda32e4b738383c2595ca9603cf refers to a dead (removed) revision in file `lams_tool_lamc/web/author_page.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_lamc/web/authoringMaincontent.jsp
===================================================================
diff -u -re641617111e90d02c659127046f06b0f5c8e2845 -rc36523c3640d5bda32e4b738383c2595ca9603cf
--- lams_tool_lamc/web/authoringMaincontent.jsp	(.../authoringMaincontent.jsp)	(revision e641617111e90d02c659127046f06b0f5c8e2845)
+++ lams_tool_lamc/web/authoringMaincontent.jsp	(.../authoringMaincontent.jsp)	(revision c36523c3640d5bda32e4b738383c2595ca9603cf)
@@ -41,7 +41,7 @@
 </head>
 <body onLoad="initTabs()">
 
-<h1>Noticeboard</h1>
+<h1>Multipe Choice</h1>
     
     <!-- start tabs -->
 <!-- tab holder table -->
@@ -83,16 +83,24 @@
   </tr>
 </table>
     <!-- end tab buttons -->
-    
-    
-    
-    
 
+<!-- error holder table -->    
+<table border="0" cellspacing="0" cellpadding="0">
+<tr> 
+	<td class="error">   
+	<html:errors/>
+</td></tr>    
+</table>
+
     <!-- tab content one (basic)-->
 <div id='content_b' class="tabbody content_b" >
 <h2>Basic tab content</h2>
 <div id="formtablecontainer">
-The basic contents should go here
+	  <tr>
+		<td>
+			<c:out value="${sessionScope.defaultQuestionContent}"/>
+		</td>
+	  </tr>		
 </div>
 <hr>
 <a href="javascript:;" class="button">Cancel</a>
Fisheye: Tag c36523c3640d5bda32e4b738383c2595ca9603cf refers to a dead (removed) revision in file `lams_tool_lamc/web/exportPortfolioIndex.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c36523c3640d5bda32e4b738383c2595ca9603cf refers to a dead (removed) revision in file `lams_tool_lamc/web/groupsReport.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c36523c3640d5bda32e4b738383c2595ca9603cf refers to a dead (removed) revision in file `lams_tool_lamc/web/learnerReport.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c36523c3640d5bda32e4b738383c2595ca9603cf refers to a dead (removed) revision in file `lams_tool_lamc/web/learningIndex.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c36523c3640d5bda32e4b738383c2595ca9603cf refers to a dead (removed) revision in file `lams_tool_lamc/web/monitoringIndex.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c36523c3640d5bda32e4b738383c2595ca9603cf refers to a dead (removed) revision in file `lams_tool_lamc/web/monitoringReport.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c36523c3640d5bda32e4b738383c2595ca9603cf refers to a dead (removed) revision in file `lams_tool_lamc/web/portfolioReport.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_lamc/web/questionsContent.jsp
===================================================================
diff -u -r653f0f0eff40af5e6891c22ef2b8efe9bf2f75af -rc36523c3640d5bda32e4b738383c2595ca9603cf
--- lams_tool_lamc/web/questionsContent.jsp	(.../questionsContent.jsp)	(revision 653f0f0eff40af5e6891c22ef2b8efe9bf2f75af)
+++ lams_tool_lamc/web/questionsContent.jsp	(.../questionsContent.jsp)	(revision c36523c3640d5bda32e4b738383c2595ca9603cf)
@@ -26,56 +26,11 @@
 				  requestScope.userExceptionDefaultContentNotSetup != 'true'  && 				  
   				  requestScope.userExceptionUserIdNotNumeric != 'true'  && 
 				  requestScope.userExceptionDefaultQuestionContentNotAvailable != 'true'}"> 	
-		<!-- Dave to do the styling-->
-		<!-- this form is exists temporarily to represent tool icon, remove this form once the tool is deployed into authoring environment -->
-		<c:if test="${requestScope.startMonitoringSummaryRequest == 'true'}"> 			
-			<html:form  action="/authoring?method=loadMonitoring&validate=false" enctype="multipart/form-data" method="POST" target="_self">
-				<table align=center> <!-- Dave to take off--> 
-				<tr>
-						<td>
-							<html:submit property="summaryMonitoring" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-								<bean:message key="button.summary"/>
-							</html:submit> 
-						</td><td>
-							<html:submit property="instructionsMonitoring" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-								<bean:message key="button.instructions"/>
-							</html:submit> 
-						</td><td>
-							<html:submit property="editActivityMonitoring" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-								<bean:message key="button.editActivity"/>
-							</html:submit> 
-						</td><td>			
-							<html:submit property="statsMonitoring" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-								<bean:message key="button.stats"/>
-							</html:submit> 
-						</td>
-				</tr>
-				</table>
-			</html:form>		
-		</c:if>						
 		
 		<html:form  action="/authoring?method=loadQ&validate=false" enctype="multipart/form-data" method="POST" target="_self">
-		<table align=center> <!-- Dave to take off--> 
-			<c:if test="${requestScope.stopRenderingQuestions != 'true'}"> 			
-				<tr><td>
-					<fmt:message key="label.authoring.qa"/>
-				</td></tr>
-			</c:if>								
-			
-			<c:if test="${sessionScope.isDefineLater == 'true'}"> 			
-				<c:if test="${requestScope.startMonitoringSummaryRequest != 'true'}"> 			
-					<tr><td class="error">
-						<fmt:message key="error.content.beingModified"/>
-					</td></tr>
-				</c:if>						
-			</c:if>						
+		<table align=center> 
 
 			<c:if test="${sessionScope.isDefineLater != 'true' || sessionScope.isMonitoringDefineLater == 'true' }"> 			
-				<c:if test="${sessionScope.contentLocked == 'true'}"> 			
-					<tr><td class="error">
-						<fmt:message key="error.content.inUse"/>
-					</td></tr>
-				</c:if>						
 				<c:if test="${sessionScope.contentLocked == 'false'}"> 			
 					<tr> <td class="error">
 						<html:errors/>
Fisheye: Tag c36523c3640d5bda32e4b738383c2595ca9603cf refers to a dead (removed) revision in file `lams_tool_lamc/web/singleLearnerReport.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?