Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/MindmapUserDTO.java
===================================================================
diff -u -r26ce6de9fba8494203a85a4ce076b6ffea4238ed -rdbadec7747ba50b996bd7537305023d25546e96d
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/MindmapUserDTO.java	(.../MindmapUserDTO.java)	(revision 26ce6de9fba8494203a85a4ce076b6ffea4238ed)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/MindmapUserDTO.java	(.../MindmapUserDTO.java)	(revision dbadec7747ba50b996bd7537305023d25546e96d)
@@ -104,4 +104,12 @@
     public void setFinishedActivity(boolean finishedActivity) {
 	this.finishedActivity = finishedActivity;
     }
+    
+    public void setEntryDTO(NotebookEntryDTO entryDTO) {
+	this.entryDTO = entryDTO;
+    }
+    
+    public NotebookEntryDTO getEntryDTO() {
+	return entryDTO;
+    }
 }
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/servlets/ExportServlet.java
===================================================================
diff -u -rcca6c38bd6def1a659e90ce78a38a69410d75fcc -rdbadec7747ba50b996bd7537305023d25546e96d
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision cca6c38bd6def1a659e90ce78a38a69410d75fcc)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision dbadec7747ba50b996bd7537305023d25546e96d)
@@ -38,10 +38,12 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 
+import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.mindmap.dto.MindmapDTO;
 import org.lamsfoundation.lams.tool.mindmap.dto.MindmapSessionDTO;
 import org.lamsfoundation.lams.tool.mindmap.dto.MindmapUserDTO;
+import org.lamsfoundation.lams.tool.mindmap.dto.NotebookEntryDTO;
 import org.lamsfoundation.lams.tool.mindmap.model.Mindmap;
 import org.lamsfoundation.lams.tool.mindmap.model.MindmapNode;
 import org.lamsfoundation.lams.tool.mindmap.model.MindmapSession;
@@ -95,26 +97,35 @@
 	    if (StringUtils.equals(mode, ToolAccessMode.LEARNER.toString())) {
 		request.getSession().setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.LEARNER);
 		doLearnerExport(request, response, directoryName, cookies);
-		writeResponseToFile(basePath + "/pages/export/exportPortfolio.jsp", directoryName, FILENAME, cookies);
+		writeResponseToFile(basePath + "/pages/export/exportPortfolioSinglemode.jsp", directoryName, FILENAME, cookies);
 		
 		return FILENAME;
 	    }
 	    else if (StringUtils.equals(mode, ToolAccessMode.TEACHER.toString())) {
 		request.getSession().setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER);
 		
 		Mindmap mindmap = mindmapService.getMindmapByContentId(toolContentID);
+		MindmapDTO mindmapDTO = new MindmapDTO(mindmap);
+		mindmapDTO.setTitle(mindmap.getTitle());
+		mindmapDTO.setInstructions(mindmap.getInstructions());
 		
 		if (mindmap.isMultiUserMode()) {
-		    doTeacherMultiModeExport(request, response, directoryName, cookies);
-		    writeResponseToFile(basePath + "/pages/export/exportPortfolioMultimode.jsp", directoryName, FILENAME, cookies);
+		    Set<MindmapSessionDTO> sessionDTOs = mindmapDTO.getSessionDTOs();
+		    for (Iterator iterator = sessionDTOs.iterator(); iterator.hasNext();) {
+			MindmapSessionDTO mindmapSessionDTO = (MindmapSessionDTO) iterator.next();
+			
+			String filename = mindmapSessionDTO.getSessionName() + "_" + mindmapSessionDTO.getSessionID() + ".html";
+			
+			doTeacherMultiModeExport(request, response, directoryName, cookies, mindmap, mindmapSessionDTO);
+			writeResponseToFile(basePath + "/pages/export/exportPortfolioMultimode.jsp", directoryName, filename, cookies);
+		    }
+		    request.getSession().setAttribute("mindmapDTO", mindmapDTO);
+		    
+		    writeResponseToFile(basePath + "/pages/export/exportPortfolioMultimodeLinks.jsp", directoryName, FILENAME, cookies);
 		
 		    return FILENAME;
 		}
 		else {
-		    MindmapDTO mindmapDTO = new MindmapDTO(mindmap);
-		    mindmapDTO.setTitle(mindmap.getTitle());
-		    mindmapDTO.setInstructions(mindmap.getInstructions());
-		    
 		    Set<MindmapSessionDTO> sessionDTOs = mindmapDTO.getSessionDTOs();
 		    for (Iterator iterator = sessionDTOs.iterator(); iterator.hasNext();) {
 			MindmapSessionDTO mindmapSessionDTO = (MindmapSessionDTO) iterator.next();	    
@@ -127,13 +138,13 @@
 			    	"_" + mindmapUser.getUid() + ".html";
 			    
 			    doTeacherSingleModeExport(request, response, directoryName, cookies, mindmap, mindmapUser);
-			    writeResponseToFile(basePath + "/pages/export/exportPortfolioMultimode.jsp", directoryName, filename, cookies);
+			    writeResponseToFile(basePath + "/pages/export/exportPortfolioSinglemode.jsp", directoryName, filename, cookies);
 			}
 		    }
 		    
 		    request.getSession().setAttribute("mindmapDTO", mindmapDTO);
 		    
-		    writeResponseToFile(basePath + "/pages/export/exportPortfolioMultimodeLinks.jsp", directoryName, FILENAME, cookies);
+		    writeResponseToFile(basePath + "/pages/export/exportPortfolioSinglemodeLinks.jsp", directoryName, FILENAME, cookies);
 		    
 		    return FILENAME;
 		}
@@ -199,7 +210,6 @@
 	    }
 	}
     }
-    
 
     private void doLearnerExport(HttpServletRequest request, HttpServletResponse response, String directoryName,
 	    Cookie[] cookies) throws MindmapException {
@@ -228,13 +238,21 @@
 	sessionDTO.setSessionID(mindmapSession.getSessionId());
 
 	MindmapUserDTO userDTO = new MindmapUserDTO(mindmapUser);
-
+	
+	if (mindmap.isReflectOnActivity()) {
+	    NotebookEntry notebookEntry = mindmapService.getEntry(mindmapUser.getEntryUID());
+	    NotebookEntryDTO notebookEntryDTO = new NotebookEntryDTO(notebookEntry);
+	    userDTO.setEntryDTO(notebookEntryDTO);
+	}
+	
 	sessionDTO.getUserDTOs().add(userDTO);
 	mindmapDTO.getSessionDTOs().add(sessionDTO);
 
 	// adding Mindmap files to archive
+	
 	request.getSession().setAttribute("mindmapContentPath", "mindmap.xml");
 	request.getSession().setAttribute("localizationPath", "locale.xml");
+	request.getSession().setAttribute("mindmapUserDTO", userDTO);
 	
 	String currentMindmapUser = mindmapUser.getFirstName() + " " + mindmapUser.getLastName();
 	request.getSession().setAttribute("currentMindmapUser", currentMindmapUser);
@@ -258,6 +276,14 @@
 	String filename = mindmapUser.getFirstName() + "_" + mindmapUser.getLastName() + 
 		"_" + mindmapUser.getUid();
 	
+	if (mindmap.isReflectOnActivity()) {
+	    MindmapUserDTO userDTO = new MindmapUserDTO(mindmapUser);
+	    NotebookEntry notebookEntry = mindmapService.getEntry(mindmapUser.getEntryUID());
+	    NotebookEntryDTO notebookEntryDTO = new NotebookEntryDTO(notebookEntry);
+	    userDTO.setEntryDTO(notebookEntryDTO);
+	    request.getSession().setAttribute("mindmapUserDTO", userDTO);
+	}
+	
 	request.getSession().setAttribute("mindmapContentPath", filename + ".xml");
 	request.getSession().setAttribute("localizationPath", "locale.xml");
 	
@@ -270,38 +296,32 @@
     }
     
     private void doTeacherMultiModeExport(HttpServletRequest request, HttpServletResponse response, String directoryName,
-	    Cookie[] cookies) throws MindmapException {
+	    Cookie[] cookies, Mindmap mindmap, MindmapSessionDTO mindmapSessionDTO) 
+    		throws MindmapException {
 
 	logger.debug("doExportTeacher: toolContentID: " + toolContentID);
-
-	// check if toolContentID available
-	if (toolContentID == null) {
-	    String error = "Tool Content ID is missing. Unable to continue";
-	    logger.error(error);
-	    throw new MindmapException(error);
-	}
 	
-	Mindmap mindmap = mindmapService.getMindmapByContentId(toolContentID);
-	MindmapDTO mindmapDTO = new MindmapDTO(mindmap);
-	mindmapDTO.setTitle(mindmap.getTitle());
-	mindmapDTO.setInstructions(mindmap.getInstructions());
+	String filename = mindmapSessionDTO.getSessionName() + "_" + mindmapSessionDTO.getSessionID();
 	
-	request.getSession().setAttribute("localizationPath", "locale.xml");
-	
-	// if Mindmap is in Multi-mode
-	if (mindmap.isMultiUserMode())
-	{
-	    Set<MindmapSessionDTO> sessionDTOs = mindmapDTO.getSessionDTOs();
-	    for (Iterator iterator = sessionDTOs.iterator(); iterator.hasNext();) {
-		MindmapSessionDTO mindmapSessionDTO = (MindmapSessionDTO) iterator.next();
-		    
-		List mindmapNodeList = mindmapService.getAuthorRootNodeByMindmapSession(mindmap.getUid(), mindmapSessionDTO.getSessionID());
-		
-		exportMindmapNodes(mindmapNodeList, mindmap, null, directoryName + "/mindmap.xml");
+	if (mindmap.isReflectOnActivity()) {
+	    Set<MindmapUserDTO> userDTOs = mindmapSessionDTO.getUserDTOs();
+	    for (Iterator userIterator = userDTOs.iterator(); userIterator.hasNext();) {
+		MindmapUserDTO mindmapUserDTO = (MindmapUserDTO) userIterator.next();
+		MindmapUser mindmapUser = mindmapService.getUserByUID(mindmapUserDTO.getUid());
+		NotebookEntry notebookEntry = mindmapService.getEntry(mindmapUser.getEntryUID());
+		NotebookEntryDTO notebookEntryDTO = new NotebookEntryDTO(notebookEntry);
+		mindmapUserDTO.setEntryDTO(notebookEntryDTO);
 	    }
+	    request.getSession().setAttribute("userDTOs", userDTOs);
 	}
 	
-	request.getSession().setAttribute("mindmapDTO", mindmapDTO);
+	request.getSession().setAttribute("mindmapContentPath", filename + ".xml");
+	request.getSession().setAttribute("localizationPath", "locale.xml");
+	    
+	List mindmapNodeList = mindmapService.getAuthorRootNodeByMindmapSession(mindmap.getUid(), mindmapSessionDTO.getSessionID());
+	    
+	exportMindmapNodes(mindmapNodeList, mindmap, null, directoryName + "/" + filename + ".xml");
+	
     }
     
 }
Fisheye: Tag dbadec7747ba50b996bd7537305023d25546e96d refers to a dead (removed) revision in file `lams_tool_mindmap/web/pages/export/exportPortfolio.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_mindmap/web/pages/export/exportPortfolioMultimode.jsp
===================================================================
diff -u -rcca6c38bd6def1a659e90ce78a38a69410d75fcc -rdbadec7747ba50b996bd7537305023d25546e96d
--- lams_tool_mindmap/web/pages/export/exportPortfolioMultimode.jsp	(.../exportPortfolioMultimode.jsp)	(revision cca6c38bd6def1a659e90ce78a38a69410d75fcc)
+++ lams_tool_mindmap/web/pages/export/exportPortfolioMultimode.jsp	(.../exportPortfolioMultimode.jsp)	(revision dbadec7747ba50b996bd7537305023d25546e96d)
@@ -39,29 +39,42 @@
 			<c:out value="${mindmapDTO.instructions}" escapeXml="false" />
 		</p>
 	
-				<table>
-					<tr>
-						<th colspan="2">
-							<fmt:message>label.multimode</fmt:message>
-						</th>
-					</tr>
+			<table>
+				<tr>
+					<th colspan="2">
+						<fmt:message>label.multimode</fmt:message>
+					</th>
+				</tr>
 								
-					<tr>
-						<td class="field-name" width="20%">
-							<fmt:message key="label.mindmapEntry" />
-						</td>
+				<tr>
+					<td class="field-name" width="20%">
+						<fmt:message key="label.mindmapEntry" />
+					</td>
 							
-						<td>
-							<center id="center12">
-								<div id="flashContent">
-									<fmt:message>message.enableJavaScript</fmt:message>
-								</div>
-							</center>
-						</td>
-					</tr>	
-				</table>
+					<td>
+						<center id="center12">
+							<div id="flashContent">
+								<fmt:message>message.enableJavaScript</fmt:message>
+							</div>
+						</center>
+					</td>
+				</tr>
 				
+				<c:forEach var="user" items="${userDTOs}">
+					<c:if test="${!empty user.entryDTO.entry}">
+						<tr>
+							<td class="field-name" width="20%">
+								${user.firstName} ${user.lastName}
+							</td>
+							<td>
+								${user.entryDTO.entry}
+							</td>
+						</tr>
+					</c:if>
+				</c:forEach>		
 				
+			</table>
+				
 		</div>
 		<!--closes content-->
 
Index: lams_tool_mindmap/web/pages/export/exportPortfolioMultimodeLinks.jsp
===================================================================
diff -u -rcca6c38bd6def1a659e90ce78a38a69410d75fcc -rdbadec7747ba50b996bd7537305023d25546e96d
--- lams_tool_mindmap/web/pages/export/exportPortfolioMultimodeLinks.jsp	(.../exportPortfolioMultimodeLinks.jsp)	(revision cca6c38bd6def1a659e90ce78a38a69410d75fcc)
+++ lams_tool_mindmap/web/pages/export/exportPortfolioMultimodeLinks.jsp	(.../exportPortfolioMultimodeLinks.jsp)	(revision dbadec7747ba50b996bd7537305023d25546e96d)
@@ -28,27 +28,25 @@
 					&nbsp;
 				</p>
 				
-				<c:forEach var="user" items="${session.userDTOs}">
-					<table>
-						<tr>
-							<th colspan="2">
-								${user.firstName} ${user.lastName}
-							</th>
-						</tr>
+				<table>
+					<tr>
+						<th colspan="2">
+							<fmt:message>label.multimode</fmt:message>
+						</th>
+					</tr>
 								
-						<tr>
-							<td class="field-name" width="20%">
-								<fmt:message key="label.mindmapEntry" />
-							</td>
-							<td>
-								<a href="${user.firstName}_${user.lastName}_${user.uid}.html">
-									<fmt:message key="label.view" />
-								</a>							
-							</td>
-						</tr>
+					<tr>
+						<td class="field-name" width="20%">
+							<fmt:message key="label.mindmapEntry" />
+						</td>
+						<td>
+							<a href="${session.sessionName}_${session.sessionID}.html">
+								<fmt:message key="label.view" />
+							</a>							
+						</td>
+					</tr>
 								
-					</table>
-				</c:forEach>
+				</table>
 				
 			</div>
 		</c:forEach>
Index: lams_tool_mindmap/web/pages/export/exportPortfolioSinglemode.jsp
===================================================================
diff -u
--- lams_tool_mindmap/web/pages/export/exportPortfolioSinglemode.jsp	(revision 0)
+++ lams_tool_mindmap/web/pages/export/exportPortfolioSinglemode.jsp	(revision dbadec7747ba50b996bd7537305023d25546e96d)
@@ -0,0 +1,86 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+
+<script type="text/javascript" src="swfobject.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="jquery.js"></script>
+
+<script type="text/javascript">
+<!--
+	flashvars = { xml: "${mindmapContentPath}", user: "${currentMindmapUser}", dictionary: "${localizationPath}" }
+	
+	$(window).resize(makeNice);
+
+	embedFlashObject(700, 525);
+
+	function embedFlashObject(x, y)
+	{
+		swfobject.embedSWF("mindmap.swf", "flashContent", x, y, "9.0.0", false, flashvars);
+	}
+-->
+</script>
+
+<html>
+	<lams:head>
+		<title><c:out value="${mindmapDTO.title}" escapeXml="false" />
+		</title>
+		<lams:css localLinkPath="../" />
+	</lams:head>
+
+	<body class="stripes">
+
+			<div id="content">
+
+				<h1>
+					<c:out value="${mindmapDTO.title}" escapeXml="false" />
+				</h1>
+
+				<p>
+					<c:out value="${mindmapDTO.instructions}" escapeXml="false" />
+				</p>
+
+				<c:set var="user" value="${mindmapUserDTO}" />
+				
+				<table>
+					<tr>
+						<th colspan="2">
+							${user.firstName} ${user.lastName}
+						</th>
+					</tr>
+								
+					<tr>
+						<td class="field-name" width="20%">
+							<fmt:message key="label.mindmapEntry" />
+						</td>
+						<td>
+							<center id="center12">
+								<div id="flashContent">
+									<fmt:message>message.enableJavaScript</fmt:message>
+								</div>
+							</center>
+						</td>
+					</tr>
+					
+					<c:if test="${!empty user.entryDTO.entry}">
+						<tr>
+							<td class="field-name" width="20%">
+								<fmt:message key="label.notebookEntry" />
+							</td>
+							<td>
+								${user.entryDTO.entry}
+							</td>
+						</tr>
+					</c:if>
+					
+				</table>
+				
+			</div>
+			<!--closes content-->
+
+			<div id="footer">
+			</div>
+			<!--closes footer-->
+
+	</body>
+</html>
Index: lams_tool_mindmap/web/pages/export/exportPortfolioSinglemodeLinks.jsp
===================================================================
diff -u
--- lams_tool_mindmap/web/pages/export/exportPortfolioSinglemodeLinks.jsp	(revision 0)
+++ lams_tool_mindmap/web/pages/export/exportPortfolioSinglemodeLinks.jsp	(revision dbadec7747ba50b996bd7537305023d25546e96d)
@@ -0,0 +1,64 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+
+<html>
+	<lams:head>
+		<title><c:out value="${mindmapDTO.title}" escapeXml="false" />
+		</title>
+		<lams:css localLinkPath="../" />
+	</lams:head>
+
+	<body class="stripes">
+		<div id="content">
+		<h1>
+			<c:out value="${mindmapDTO.title}" escapeXml="false" />
+		</h1>
+
+		<p>
+			<c:out value="${mindmapDTO.instructions}" escapeXml="false" />
+		</p>
+
+		<c:forEach var="session" items="${mindmapDTO.sessionDTOs}">
+			<div id="sid-${session.sessionID}">
+				<h2>
+					${session.sessionName}
+				</h2>
+				<p>
+					&nbsp;
+				</p>
+				
+				<c:forEach var="user" items="${session.userDTOs}">
+					<table>
+						<tr>
+							<th colspan="2">
+								${user.firstName} ${user.lastName}
+							</th>
+						</tr>
+								
+						<tr>
+							<td class="field-name" width="20%">
+								<fmt:message key="label.mindmapEntry" />
+							</td>
+							<td>
+								<a href="${user.firstName}_${user.lastName}_${user.uid}.html">
+									<fmt:message key="label.view" />
+								</a>							
+							</td>
+						</tr>
+								
+					</table>
+				</c:forEach>
+				
+			</div>
+		</c:forEach>
+				
+		</div>
+		<!--closes content-->
+
+		<div id="footer">
+		</div>
+		<!--closes footer-->
+
+	</body>
+</html>