Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringStarterAction.java
===================================================================
diff -u -rd66f1d59f9802519653383ac842dce858b469724 -radbcf56486df0578f4daad72035ba4f0d9a2db22
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringStarterAction.java	(.../NbAuthoringStarterAction.java)	(revision d66f1d59f9802519653383ac842dce858b469724)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringStarterAction.java	(.../NbAuthoringStarterAction.java)	(revision adbcf56486df0578f4daad72035ba4f0d9a2db22)
@@ -26,7 +26,10 @@
 package org.lamsfoundation.lams.tool.noticeboard.web;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -47,12 +50,14 @@
 import org.lamsfoundation.lams.tool.noticeboard.NbApplicationException;
 
 import org.lamsfoundation.lams.tool.noticeboard.util.NbWebUtil; 
-/**TODO: change into one utility class */
+
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.util.MessageResources;
 
+import org.lamsfoundation.lams.tool.noticeboard.NoticeboardAttachment;
 
+
 /**
  * Creation Date: 19-05-05
  *  
@@ -97,6 +102,8 @@
 	    
 		NbAuthoringForm nbForm = (NbAuthoringForm)form;
 		
+		NbWebUtil.cleanAuthoringSession(request); 
+		
 		Long contentId = NbWebUtil.convertToLong(request.getParameter(NoticeboardConstants.TOOL_CONTENT_ID));
 		
 		if(contentId == null)
@@ -116,8 +123,8 @@
 		nbForm.setDefineLater((String)request.getParameter(NoticeboardConstants.DEFINE_LATER));
 
 		
-		NbWebUtil.cleanAuthoringSession(request); 
 		
+		
 		request.getSession().setAttribute(NoticeboardConstants.TOOL_CONTENT_ID, contentId);
 							
 		/*
@@ -166,6 +173,9 @@
 			    nbForm.populateFormWithNbContentValues(nb);
 			    nb = setTrueIfDefineLaterIsSet(nbForm, nb);
 			    nbService.updateNoticeboard(nb);
+			    
+			    /** TODO: setup values in the instructions map */
+			 
 			}
 			else
 			{
@@ -178,6 +188,20 @@
 			    
 			}
 			
+			//Setup the map containing the files that have been uploaded for this particular tool content id
+			Map attachmentMap = nbForm.getAttachments();
+			
+			List attachmentIdList = nbService.getAttachmentIdsFromContent(nb);
+			for (int i=0; i<attachmentIdList.size(); i++)
+			{
+			    NoticeboardAttachment file = nbService.retrieveAttachment((Long)attachmentIdList.get(i));
+			    String fileType = file.returnFileType();
+			    String keyName = file.getFilename() + "-" + fileType;
+			    attachmentMap.put(keyName, file);
+			}
+			nbForm.setAttachments(attachmentMap);
+			
+			NbWebUtil.addUploadsToSession(request, attachmentMap);
 		
 		}