Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v
diff -u -r1.46 -r1.47
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	7 Mar 2006 18:20:12 -0000	1.46
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	7 Mar 2006 19:54:04 -0000	1.47
@@ -30,7 +30,7 @@
 	public static final long DEFAULT_CONTENT_ID 						=0;
     public static final long DEFAULT_QUE_CONTENT_ID 					=1;
 	public static final String TOOL_SERVICE								="tool_service";
-	public static final String ERROR_MCAPPLICATION 						= "error.exception.QaApplication";
+	public static final String ERROR_QAAPPLICATION 						= "error.exception.QaApplication";
 	public static final String TOOL_CONTENT_ID 							= "toolContentID";
 
 	public static final String TARGET_MODE								="targetMode";
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaResources.properties,v
diff -u -r1.28 -r1.29
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties	7 Mar 2006 18:20:12 -0000	1.28
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties	7 Mar 2006 19:54:04 -0000	1.29
@@ -29,6 +29,7 @@
 label.offlineFiles						=Offline Files:
 label.onlineFiles						=Online Files:
 label.exportPortfolio.simple			=Export Portfolio
+label.exportPortfolio					=Q/A Export Portfolio
 
 instructions.type.online                =Online
 instructions.type.offline               =Offline
@@ -60,6 +61,7 @@
 radiobox.forceOffline					=Force Offline
 radiobox.usernameVisible				=Username Visible
 radiobox.questionsSequenced				=Questions Sequenced 
+radiobox.showFeedback					=Show Feedback
 label.offlineInstructions				=Offline Instructions
 label.onlineInstructions				=Online Instructions
 label.offlineFiles						=Offline Files:
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaUtils.java,v
diff -u -r1.34 -r1.35
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	7 Mar 2006 16:06:57 -0000	1.34
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	7 Mar 2006 19:54:04 -0000	1.35
@@ -437,7 +437,7 @@
 	public static void cleanUpSessionAbsolute(HttpServletRequest request)
 	{
 		request.getSession().removeAttribute(MY_SIGNATURE);
-		request.getSession().removeAttribute(ERROR_MCAPPLICATION);
+		request.getSession().removeAttribute(ERROR_QAAPPLICATION);
 		request.getSession().removeAttribute(TARGET_MODE);
 		request.getSession().removeAttribute(TARGET_MODE_AUTHORING);
 		request.getSession().removeAttribute(TARGET_MODE_LEARNING);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/CustomStrutsExceptionHandler.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/CustomStrutsExceptionHandler.java,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/CustomStrutsExceptionHandler.java	24 Feb 2006 15:05:59 -0000	1.2
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/CustomStrutsExceptionHandler.java	7 Mar 2006 19:54:04 -0000	1.3
@@ -73,7 +73,7 @@
 	        logger.error("errorMessage: " + errorMessage);
 	        ActionMessage error = null;
 	        if (QaApplicationException.class.isInstance(ex) ) {
-		        error = new ActionMessage(QaAppConstants.ERROR_MCAPPLICATION, errorMessage );
+		        error = new ActionMessage(QaAppConstants.ERROR_QAAPPLICATION, errorMessage );
 	        }        
 	        storeException(request, property, error, forward, ae.getScope( ));
 	        /* process the exception as normal */
Index: lams_tool_laqa/web/exportPortfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/exportPortfolio.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/web/exportPortfolio.jsp	24 Feb 2006 15:05:59 -0000	1.2
+++ lams_tool_laqa/web/exportPortfolio.jsp	7 Mar 2006 19:54:04 -0000	1.3
@@ -27,13 +27,11 @@
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html:html locale="true">
   	<head>    
 	    <title><bean:message key="label.exportPortfolio"/></title>
-		<lams:css localLink="true" />
 	</head>  
   	<body>
    		<h1><bean:message key="label.exportPortfolio.simple"/></h1>
Index: lams_tool_laqa/web/learningIndex.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/learningIndex.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_laqa/web/learningIndex.jsp	24 Feb 2006 15:05:59 -0000	1.4
+++ lams_tool_laqa/web/learningIndex.jsp	7 Mar 2006 19:54:04 -0000	1.5
@@ -47,6 +47,12 @@
 	String strLearnerProgress2="/learningStarter?toolSessionID=" + toolSessionID2 +  "&mode=teacher" + "&userID=1";
 	String strLearnerProgress3="/learningStarter?toolSessionID=" + toolSessionID +  "&mode=teacher" + "&userID=4";
 	String strLearnerProgress4="/learningStarter?toolSessionID=" + toolSessionID +  "&mode=teacher" + "&userID=1";
+	
+	String exportPortfolioStudent8 = "/exportPortfolio.do?mode=learner&toolSessionID=88888888&userID=4";	
+	String exportPortfolioStudent5 = "/exportPortfolio.do?mode=learner&toolSessionID=55555555&userID=1";	
+	
+	String exportPortfolioStudent9 = "/exportPortfolio.do?mode=learner&toolSessionID=55555555&userID=5";	
+	String exportPortfolioStudent10 = "/exportPortfolio.do?mode=learner&toolSessionID=88888888&userID=6";	
 %>
 
 <html:form action="<%=strCreateToolSession%>" method="post">
@@ -128,4 +134,27 @@
       <html:submit value="View Learner Progress 88888888 id:1"/>
 </html:form>
 
+<html:form action="<%=exportPortfolioStudent8%>" method="post">
+      <table border=1>
+      </table><br/><BR>
+      <html:submit value="Export Portfolio Student, session id: 88888888"/>
+</html:form>
 
+<html:form action="<%=exportPortfolioStudent5%>" method="post">
+      <table border=1>
+      </table><br/><BR>
+      <html:submit value="Export Portfolio Student, session id: 55555555"/>
+</html:form>
+
+<html:form action="<%=exportPortfolioStudent9%>" method="post">
+      <table border=1>
+      </table><br/><BR>
+      <html:submit value="Export Portfolio Student, session id: 55555555, id:5"/>
+</html:form>
+
+<html:form action="<%=exportPortfolioStudent10%>" method="post">
+      <table border=1>
+      </table><br/><BR>
+      <html:submit value="Export Portfolio Student, session id: 88888888, id=6"/>
+</html:form>
+
Index: lams_tool_laqa/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/struts-config.xml,v
diff -u -r1.19 -r1.20
--- lams_tool_laqa/web/WEB-INF/struts-config.xml	6 Mar 2006 21:25:24 -0000	1.19
+++ lams_tool_laqa/web/WEB-INF/struts-config.xml	7 Mar 2006 19:54:04 -0000	1.20
@@ -16,6 +16,7 @@
 	<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="QaExportForm" type="org.lamsfoundation.lams.tool.qa.web.QaExportForm"/>		   	
 </form-beans>
 
   <!-- ========== Global Exceptions Definitions =================================== -->
@@ -284,7 +285,30 @@
 		    redirect="true"
 	  	/>
 	</action>
+	
+	   <!--Export Portfolio Action -->
+	    <action
+		      path="/exportPortfolio"
+		      type="org.lamsfoundation.lams.tool.qa.web.QaExportAction"
+		      name="QaExportForm"
+		      scope="session"
+		      parameter="mode"
+		      unknown="false"
+		      validate="false"
+	    >
+	    <forward
+    	    name="exportPortfolio"
+        	path="/exportPortfolio.jsp"
+	        redirect="false"
+    	  />
 
+	  	<forward
+		    name="errorList"
+		    path="/McErrorBox.jsp"
+		    redirect="true"
+	  	/>
+    </action>
+
  </action-mappings>
 
   <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->