Index: lams_tool_vote/build.xml
===================================================================
diff -u -rc5172424555b18ee103dd5609fd36e2d886d035a -rb523c049772bec9396882cecd81fdb23a91b5c19
--- lams_tool_vote/build.xml	(.../build.xml)	(revision c5172424555b18ee103dd5609fd36e2d886d035a)
+++ lams_tool_vote/build.xml	(.../build.xml)	(revision b523c049772bec9396882cecd81fdb23a91b5c19)
@@ -257,7 +257,7 @@
 	   					<include name="author_page/**"/>
 						<include name="authoring/*"/>
 						<include name="learning/*"/>
-						<include name="sharing/*"/>	   				
+		   				<include name="export/*"/>
 						<include name="css/*"/>	   					   				
 						<include name="includes/*"/>	   					   				
 		   				<include name="monitoring/*"/>
Index: lams_tool_vote/conf/language/ApplicationResources.properties
===================================================================
diff -u -r2be43d0e5d701ff9c00b32c85e0d35f3367d52cb -rb523c049772bec9396882cecd81fdb23a91b5c19
--- lams_tool_vote/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2be43d0e5d701ff9c00b32c85e0d35f3367d52cb)
+++ lams_tool_vote/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b523c049772bec9396882cecd81fdb23a91b5c19)
@@ -120,6 +120,7 @@
 label.save								=Save
 label.cancel							=Cancel
 label.choose.nominations				=Please choose your nominations.
+label.title.export						=Learner Submission Details
 
 feedback								=Please address the following issues before submit. <br>
 error.maxNominationCount.invalid		=Please correct this: The "Max Nominations" field in Advanced section is invalid.
Index: lams_tool_vote/db/sql/tool_insert.sql
===================================================================
diff -u -rae28185f07883077586773f760d1bde953e2d9bf -rb523c049772bec9396882cecd81fdb23a91b5c19
--- lams_tool_vote/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision ae28185f07883077586773f760d1bde953e2d9bf)
+++ lams_tool_vote/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision b523c049772bec9396882cecd81fdb23a91b5c19)
@@ -66,10 +66,11 @@
 'tool/lavote11/authoringStarter.do',
 'tool/lavote11/monitoringStarter.do',
 'tool/lavote11/defineLaterStarter.do',
-'tool/lavote11/portfolioExport?mode=learner',
-'tool/lavote11/portfolioExport?mode=teacher',
+'tool/lavote11/exportPortfolio?mode=learner',
+'tool/lavote11/exportPortfolio?mode=teacher',
 'tool/lavote11/monitoringStarter.do',
 'tool/lavote11/monitoringStarter.do',
 'org.lamsfoundation.lams.tool.vote.VoteResources',
 NOW()
 )
+
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java
===================================================================
diff -u
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java	(revision 0)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java	(revision b523c049772bec9396882cecd81fdb23a91b5c19)
@@ -0,0 +1,142 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+
+package org.lamsfoundation.lams.tool.vote.web;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.tool.vote.VoteApplicationException;
+import org.lamsfoundation.lams.tool.vote.pojos.VoteContent;
+import org.lamsfoundation.lams.tool.vote.pojos.VoteQueUsr;
+import org.lamsfoundation.lams.tool.vote.pojos.VoteSession;
+import org.lamsfoundation.lams.tool.vote.service.IVoteService;
+import org.lamsfoundation.lams.tool.vote.service.VoteServiceProxy;
+import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet;
+
+public class ExportServlet  extends AbstractExportPortfolioServlet {
+	static Logger logger = Logger.getLogger(ExportServlet.class.getName());
+	private static final long serialVersionUID = -4529093489007108143L;
+	private final String FILENAME = "vote_main.html";
+	
+	
+	public String doExport(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies)
+	{
+	    logger.debug("dispathcing doExport");
+		if (StringUtils.equals(mode,ToolAccessMode.LEARNER.toString())){
+			learner(request,response,directoryName,cookies);
+		}else if (StringUtils.equals(mode,ToolAccessMode.TEACHER.toString())){
+			teacher(request,response,directoryName,cookies);
+		}
+		
+		String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath();
+		logger.debug("basePath: " + basePath);
+		writeResponseToFile(basePath+"/export/exportportfolio.jsp",directoryName,FILENAME,cookies);
+		
+		return FILENAME;
+	}
+    
+	public void learner(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies)
+    {
+	    logger.debug("starting learner...");
+        
+    	IVoteService voteService = VoteServiceProxy.getVoteService(getServletContext());
+    	logger.debug("voteService:" + voteService);
+        
+    	logger.debug("userID:" + userID);
+    	logger.debug("toolSessionID:" + toolSessionID);
+    	
+        if (userID == null || toolSessionID == null)
+        {
+            String error = "Tool session Id or user Id is null. Unable to continue";
+            logger.error(error);
+            throw new VoteApplicationException(error);
+        }
+        
+        VoteSession voteSession=voteService.retrieveVoteSession(toolSessionID);
+        logger.debug("retrieving voteSession: " + voteSession);
+        logger.debug("voteSession uid: " + voteSession.getUid());
+        
+        VoteQueUsr learner = voteService.getVoteUserBySession(userID,voteSession.getUid());
+        logger.debug("learner: " + learner);
+        
+        if (learner == null)
+        {
+            String error="The user with user id " + userID + " does not exist in this session or session may not exist.";
+            logger.error(error);
+            throw new VoteApplicationException(error);
+        }
+        
+        VoteContent content=voteSession.getVoteContent();
+        logger.debug("content: " + content);
+        
+        if (content == null)
+        {
+            String error="The content for this activity has not been defined yet.";
+            logger.error(error);
+            throw new VoteApplicationException(error);
+        }
+
+
+        Map topicsByUser = null;
+        logger.debug("ending learner mode: ");
+		request.getSession().setAttribute("report",topicsByUser);
+    }
+    
+    public void teacher(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies)
+    {
+        logger.debug("starting teacher...");
+        
+        IVoteService voteService = VoteServiceProxy.getVoteService(getServletContext());
+        logger.debug("voteService:" + voteService);
+        logger.debug("toolContentID:" + toolContentID);
+       
+        if (toolContentID==null)
+        {
+            String error="Tool Content Id is missing. Unable to continue";
+            logger.error(error);
+            throw new VoteApplicationException(error);
+        }
+
+        VoteContent content=voteService.retrieveVote(toolContentID);
+        logger.debug("content: " + content);
+        
+        if (content == null)
+        {
+            String error="Data is missing from the database. Unable to Continue";
+            logger.error(error);
+            throw new VoteApplicationException(error);
+        }
+		
+        logger.debug("ending teacher mode: ");
+		request.getSession().setAttribute("report",null);
+    }
+}
Fisheye: Tag b523c049772bec9396882cecd81fdb23a91b5c19 refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteExportAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b523c049772bec9396882cecd81fdb23a91b5c19 refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteExportForm.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b523c049772bec9396882cecd81fdb23a91b5c19 refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteExportServlet.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_vote/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r2be43d0e5d701ff9c00b32c85e0d35f3367d52cb -rb523c049772bec9396882cecd81fdb23a91b5c19
--- lams_tool_vote/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 2be43d0e5d701ff9c00b32c85e0d35f3367d52cb)
+++ lams_tool_vote/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision b523c049772bec9396882cecd81fdb23a91b5c19)
@@ -7,7 +7,6 @@
 		<form-bean name="VoteAuthoringForm" type="org.lamsfoundation.lams.tool.vote.web.VoteAuthoringForm"/>
 		<form-bean name="VoteLearningForm" type="org.lamsfoundation.lams.tool.vote.web.VoteLearningForm"/>
 		<form-bean name="VoteMonitoringForm" type="org.lamsfoundation.lams.tool.vote.web.VoteMonitoringForm"/>
-		<form-bean name="VoteExportForm" type="org.lamsfoundation.lams.tool.vote.web.VoteExportForm"/>		
 		<form-bean name="VoteChartForm" type="org.lamsfoundation.lams.tool.vote.web.VoteChartForm"/>				
 	</form-beans>
 	
@@ -458,39 +457,6 @@
 		    redirect="true"
 	  	/>
 	</action>  
-   <!--Export Portfolio Action -->
-	    <action
-		      path="/exportPortfolio"
-		      type="org.lamsfoundation.lams.tool.vote.web.VoteExportAction"
-		      name="VoteExportForm"
-		      scope="session"
-		      parameter="mode"
-		      unknown="false"
-		      validate="false"
-	    >
-
-		<exception
-	        key="error.exception.VoteApplication"
-	        type="org.lamsfoundation.lams.tool.vote.VoteApplicationException"
-	        handler="org.lamsfoundation.lams.tool.vote.web.CustomStrutsExceptionHandler"
-	        path="/VoteErrorBox.jsp"
-	        scope="request"
-	      />
-
-		<exception
-	        key="error.exception.VoteApplication"
-	        type="java.lang.NullPointerException"
-	        handler="org.lamsfoundation.lams.tool.vote.web.CustomStrutsExceptionHandler"
-	        path="/VoteErrorBox.jsp"
-	        scope="request"
-	      />	         			
-
-	  	<forward
-		    name="errorList"
-	        path="/VoteErrorBox.jsp"
-		    redirect="true"
-	  	/>
-    </action>
  </action-mappings>
 	
 	<message-resources parameter="org.lamsfoundation.lams.tool.vote.ApplicationResources"/>
Index: lams_tool_vote/web/WEB-INF/web.xml
===================================================================
diff -u -r2be43d0e5d701ff9c00b32c85e0d35f3367d52cb -rb523c049772bec9396882cecd81fdb23a91b5c19
--- lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision 2be43d0e5d701ff9c00b32c85e0d35f3367d52cb)
+++ lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision b523c049772bec9396882cecd81fdb23a91b5c19)
@@ -130,7 +130,7 @@
 	
 	<servlet>
 		<servlet-name>exportPortfolio</servlet-name>
-		<servlet-class>org.lamsfoundation.lams.tool.vote.web.VoteExportServlet</servlet-class>
+		<servlet-class>org.lamsfoundation.lams.tool.vote.web.ExportServlet</servlet-class>
 	</servlet>
 	
 	<servlet>
@@ -167,7 +167,7 @@
 
   	<servlet-mapping>
 		<servlet-name>exportPortfolio</servlet-name>
-		<url-pattern>/portfolioExport</url-pattern>
+		<url-pattern>/exportPortfolio/*</url-pattern>
   	</servlet-mapping>
 
   	<servlet-mapping>
Index: lams_tool_vote/web/export/exportportfolio.jsp
===================================================================
diff -u
--- lams_tool_vote/web/export/exportportfolio.jsp	(revision 0)
+++ lams_tool_vote/web/export/exportportfolio.jsp	(revision b523c049772bec9396882cecd81fdb23a91b5c19)
@@ -0,0 +1,42 @@
+<%@ taglib uri="tags-bean" prefix="bean"%> 
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-logic-el" prefix="logic-el" %>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="fck-editor" prefix="FCK" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set var="tool"><lams:WebAppURL/></c:set>
+
+
+	<!DOCTYPE HTML PUBLIC "-//W3C//DTD hTML 4.01 Transitional//EN">
+	<html:html locale="true">
+	<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title> <bean:message key="label.title.export"/> </title>
+	
+	 <lams:css/>
+	<!-- depending on user / site preference this will get changed probably use passed in variable from flash to select which one to use-->
+
+ 	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
+    <script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
+    <script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
+    <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
+
+	<script language="JavaScript" type="text/JavaScript">
+    	var imgRoot="${lams}images/";
+	    var themeName="aqua";
+	</script>
+	
+	<script type="text/javascript" src="<c:out value="${lams}"/>includes/javascript/tabcontroller.js"></script>    
+	<script type="text/javascript" src="<c:out value="${lams}"/>includes/javascript/common.js"></script>
+	
+</head>
+<body>
+
+		ozgur's export portf  
+
+</body>
+</html:html>
\ No newline at end of file
Fisheye: Tag b523c049772bec9396882cecd81fdb23a91b5c19 refers to a dead (removed) revision in file `lams_tool_vote/web/exportPortfolio.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?