Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml
===================================================================
diff -u -rfd1d19665518ba6781ce9e3851889c077e8efff4 -rff26fa967dd8f1982453cbe5c83381194a79f732
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision fd1d19665518ba6781ce9e3851889c077e8efff4)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision ff26fa967dd8f1982453cbe5c83381194a79f732)
@@ -149,6 +149,16 @@
             column="user_uid"
         />
 
+        <many-to-one
+            name="forum"
+            class="org.lamsfoundation.lams.tool.forum.persistence.Forum"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            column="forum_uid"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Message.xml
Index: lams_tool_forum/db/sql/create_lams_tool_forum.sql
===================================================================
diff -u -r3de24b3fb4e2ead20d187f4b5000464ae2791262 -rff26fa967dd8f1982453cbe5c83381194a79f732
--- lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
+++ lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision ff26fa967dd8f1982453cbe5c83381194a79f732)
@@ -75,4 +75,5 @@
 alter table tl_lafrum11_message add index FK4A6067E8B0A7E6B3 (user_uid), add constraint FK4A6067E8B0A7E6B3 foreign key (user_uid) references tl_lafrum11_forum_user (uid);
 alter table tl_lafrum11_tool_session add index FK5A04D7AE131CE31E (forum_uid), add constraint FK5A04D7AE131CE31E foreign key (forum_uid) references tl_lafrum11_forum (uid);
 
+INSERT INTO tl_lafrum11_forum (title,instructions,online_instructions,offline_instructions,content_id,allow_anonym,run_offline,lock_on_finished,content_in_use,define_later,allow_edit,allow_rich_editor) VALUES("LAMS Forum","Instruction","Online instruction","Offline instruction",1,0,0,0,0,0,0,0);
 SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml
===================================================================
diff -u -rfd1d19665518ba6781ce9e3851889c077e8efff4 -rff26fa967dd8f1982453cbe5c83381194a79f732
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision fd1d19665518ba6781ce9e3851889c077e8efff4)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision ff26fa967dd8f1982453cbe5c83381194a79f732)
@@ -149,6 +149,16 @@
             column="user_uid"
         />
 
+        <many-to-one
+            name="forum"
+            class="org.lamsfoundation.lams.tool.forum.persistence.Forum"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            column="forum_uid"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Message.xml
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java
===================================================================
diff -u -rfd1d19665518ba6781ce9e3851889c077e8efff4 -rff26fa967dd8f1982453cbe5c83381194a79f732
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	(.../Message.java)	(revision fd1d19665518ba6781ce9e3851889c077e8efff4)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	(.../Message.java)	(revision ff26fa967dd8f1982453cbe5c83381194a79f732)
@@ -25,6 +25,7 @@
 	private ToolSession toolSession;
 	private Message parent;
 	private ForumUser learner;
+	private Forum forum;
 	private Set replies;
 	private Set attachments;
 	
@@ -322,4 +323,16 @@
 	public void setLearner(ForumUser learner) {
 		this.learner = learner;
 	}
+	/**
+	 * @hibernate.many-to-one column="forum_uid"
+	 * 			  cascade="none"
+	 * @return
+	 */
+	public Forum getForum() {
+		return forum;
+	}
+
+	public void setForum(Forum forum) {
+		this.forum = forum;
+	}
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -r24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86 -rff26fa967dd8f1982453cbe5c83381194a79f732
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision ff26fa967dd8f1982453cbe5c83381194a79f732)
@@ -8,6 +8,7 @@
 
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.contentrepository.AccessDeniedException;
 import org.lamsfoundation.lams.contentrepository.ICredentials;
@@ -46,6 +47,8 @@
  * @version $Revision$
  */
 public class ForumService implements IForumService,ToolContentManager,ToolSessionManager {
+	private static final Logger log = Logger.getLogger(ForumService.class);
+	
 	private ForumDao forumDao;
 	private AttachmentDao attachmentDao;
 	private MessageDao messageDao;
@@ -63,7 +66,11 @@
     }
 
 	public Forum getForumByContentId(Long contentID)  throws PersistenceException {
-		return (Forum) forumDao.getByContentId(contentID);
+		Forum forum = (Forum) forumDao.getByContentId(contentID);
+		if(forum == null){
+			log.error("Could not find the content by given ID:"+contentID);
+		}
+		return forum; 
 	}
     public void deleteForum(Long forumId) throws PersistenceException {
         Forum forum = this.getForum(forumId);
@@ -81,8 +88,9 @@
     }
 
     public Message createMessage(Long forumId, Message message) throws PersistenceException {
-    	//TODO: need fix
-//        message.setToolSession(this.getForum(forumId));
+    	Forum forum = new Forum();
+    	forum.setUid(forumId);
+    	message.setForum(forum);
         messageDao.saveOrUpdate(message);
         return message;
     }
@@ -326,4 +334,8 @@
 		
 		return file;
 	}
+
+	public Forum createForum(Long contentId) throws PersistenceException {
+		return null;
+	}
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
===================================================================
diff -u -r24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86 -rff26fa967dd8f1982453cbe5c83381194a79f732
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision 24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision ff26fa967dd8f1982453cbe5c83381194a79f732)
@@ -24,6 +24,9 @@
     public void deleteForum(Long forumId) throws PersistenceException;
     public List getTopics(Long forumId) throws PersistenceException;
     public void deleteForumAttachment(Long attachmentId) throws PersistenceException;
+    public Forum createForum(Long contentId) throws PersistenceException;
+    
+    
     public Message createMessage(Long forumId, Message message) throws PersistenceException ;
     public Message editMessage(Message message) throws PersistenceException;
     public Message getMessage(Long messageId) throws PersistenceException;
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
diff -u -r3de24b3fb4e2ead20d187f4b5000464ae2791262 -rff26fa967dd8f1982453cbe5c83381194a79f732
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision 3de24b3fb4e2ead20d187f4b5000464ae2791262)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision ff26fa967dd8f1982453cbe5c83381194a79f732)
@@ -22,4 +22,5 @@
 	//TODO:hard code!!! need to read from config
 	public static final String TOOL_URL_BASE = "/lams/tool/lafrum11/";
 	public static final String SUCCESS_FLAG = "SUCCESS_FLAG";
+	public static final String FORUM_ID = "forum_id";
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -r4d23938299d7cd12c95346e9abc603374b04e212 -rff26fa967dd8f1982453cbe5c83381194a79f732
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 4d23938299d7cd12c95346e9abc603374b04e212)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision ff26fa967dd8f1982453cbe5c83381194a79f732)
@@ -49,7 +49,6 @@
 import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
 import org.lamsfoundation.lams.tool.forum.persistence.Forum;
 import org.lamsfoundation.lams.tool.forum.persistence.Message;
-import org.lamsfoundation.lams.tool.forum.persistence.MessageDao;
 import org.lamsfoundation.lams.tool.forum.service.IForumService;
 import org.lamsfoundation.lams.tool.forum.util.ForumConstants;
 import org.lamsfoundation.lams.tool.forum.web.forms.ForumForm;
@@ -144,18 +143,17 @@
 		Forum forum = null;
 		try {
 			forum = forumService.getForumByContentId(contentId);
-			if(forum != null){
-				topics = new ArrayList(MessageDTO.getMessageDTO(forum.getMessages(), user.getFirstName() + " "
-						+ user.getLastName()));
-				forumForm.setForum(forum);
-			}
+			topics = new ArrayList(MessageDTO.getMessageDTO(forum.getMessages(), user.getFirstName() + " "
+					+ user.getLastName()));
+			forumForm.setForum(forum);
 			forumForm.setToolContentID(contentId);
 		} catch (PersistenceException e) {
 			log.error(e);
 			return mapping.findForward("error");
 		}
 		
 		//set back STRUTS component value
+		request.getSession().setAttribute(ForumConstants.FORUM_ID,forum.getUid());
 		request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, topics);
 		return mapping.findForward("success");
 	}
@@ -173,6 +171,7 @@
 			HttpServletResponse response) throws IOException, ServletException, PersistenceException {
 		
 		List topics = (List) request.getSession().getAttribute(ForumConstants.AUTHORING_TOPICS_LIST);
+		Long forumId = (Long) request.getSession().getAttribute(ForumConstants.FORUM_ID);
 		//get login user (author)
 		HttpSession ss = SessionManager.getSession();
 		//get back login user DTO
@@ -198,7 +197,10 @@
 		if (topics == null) {
 			topics = new ArrayList();
 		}
-
+		//save message into database
+		forumService = getForumManager();
+		forumService.createMessage(forumId,message);
+		
 		topics.add(MessageDTO.getMessageDTO(message,user.getFirstName()+" "+user.getLastName()));
 		
 		request.setAttribute(ForumConstants.SUCCESS_FLAG,"CREATE_SUCCESS");
@@ -220,6 +222,7 @@
 			}
 			request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS_LIST,topics);
     	}
+		
 		request.setAttribute(ForumConstants.SUCCESS_FLAG,"DELETE_SUCCESS");
 		return mapping.getInputForward();
 	}
@@ -261,36 +264,39 @@
     
     public ActionForward updateTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) throws PersistenceException {
+    	//get value from HttpSession
 		List topics = (List) request.getSession().getAttribute(ForumConstants.AUTHORING_TOPICS_LIST);
+		Long forumId = (Long) request.getSession().getAttribute(ForumConstants.FORUM_ID);
+		//get param from HttpServletRequest
 		String topicIndex = (String) request.getParameter(ForumConstants.AUTHORING_TOPICS_INDEX);
 		int topicIdx = NumberUtils.stringToInt(topicIndex,-1);
 		
 		if(topicIdx != -1){
 			MessageForm messageForm = (MessageForm) form;
 			Message message = messageForm.getMessage();
-			MessageDTO oldMsg = (MessageDTO) topics.get(topicIdx);
-			if(oldMsg.getMessage()== null)
-				oldMsg.setMessage(new Message());
-			oldMsg.getMessage().setSubject(message.getSubject());
-			oldMsg.getMessage().setBody(message.getBody());
-			oldMsg.getMessage().setUpdated(new Date());
-			oldMsg.setHasAttachment(false);
-			Set attSet = null;
+			MessageDTO newMsg = (MessageDTO) topics.get(topicIdx);
+			if(newMsg.getMessage()== null)
+				newMsg.setMessage(new Message());
+			newMsg.getMessage().setSubject(message.getSubject());
+			newMsg.getMessage().setBody(message.getBody());
+			newMsg.getMessage().setUpdated(new Date());
 			if(messageForm.getAttachmentFile() != null 
 					&&  !StringUtils.isEmpty(messageForm.getAttachmentFile().getFileName())){
 				forumService = getForumManager();
 				Attachment att = forumService.uploadAttachment(messageForm.getAttachmentFile());
 				//only allow one attachment, so replace whatever
-				attSet = new HashSet();
+				Set attSet = attSet = new HashSet();
 				attSet.add(att);
-				oldMsg.setHasAttachment(true);
+				newMsg.setHasAttachment(true);
+				newMsg.getMessage().setAttachments(attSet);
 			}
-			oldMsg.getMessage().setAttachments(attSet);
+			//save message into database
+			forumService = getForumManager();
+			forumService.createMessage(forumId,newMsg.getMessage());
 		}
 		
 		request.setAttribute(ForumConstants.AUTHORING_TOPICS_INDEX,topicIndex);
 		request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, topics);
-		
 		request.setAttribute(ForumConstants.SUCCESS_FLAG,"EDIT_SUCCESS");
 		return mapping.findForward("success");
     }
@@ -301,18 +307,24 @@
 		Long uuID = new Long(WebUtil.readLongParam(request,"uuid"));
 		forumService = getForumManager();
 		forumService.deleteFromRepository(uuID,versionID);
-		
+//		get value from HttpSession
     	List topics = (List) request.getSession().getAttribute(ForumConstants.AUTHORING_TOPICS_LIST);
+    	Long forumId = (Long) request.getSession().getAttribute(ForumConstants.FORUM_ID);
+    	//get param from HttpServletRequest
 		String topicIndex = (String) request.getParameter(ForumConstants.AUTHORING_TOPICS_INDEX);
+		
 		int topicIdx = NumberUtils.stringToInt(topicIndex,-1);
 		
 		if(topicIdx != -1){
-			MessageDTO oldMsg = (MessageDTO) topics.get(topicIdx);
-			if(oldMsg.getMessage()== null)
-				oldMsg.setMessage(new Message());
-			oldMsg.getMessage().setUpdated(new Date());
-			oldMsg.setHasAttachment(false);
-			oldMsg.getMessage().setAttachments(null);
+			MessageDTO newMsg = (MessageDTO) topics.get(topicIdx);
+			if(newMsg.getMessage()== null)
+				newMsg.setMessage(new Message());
+			newMsg.getMessage().setUpdated(new Date());
+			newMsg.setHasAttachment(false);
+			newMsg.getMessage().setAttachments(null);
+			//save message into database
+			forumService = getForumManager();
+			forumService.createMessage(forumId,newMsg.getMessage());
 			
 		}
 		request.setAttribute(ForumConstants.AUTHORING_TOPICS_INDEX,topicIndex);