Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml
===================================================================
diff -u -rfd1d19665518ba6781ce9e3851889c077e8efff4 -r8f2053b9a8e7a32cf70ae7788b17cc46dc59cd95
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision fd1d19665518ba6781ce9e3851889c077e8efff4)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision 8f2053b9a8e7a32cf70ae7788b17cc46dc59cd95)
@@ -127,7 +127,7 @@
 
         <set
             name="messages"
-            lazy="false"
+            lazy="true"
             inverse="false"
             cascade="all"
             sort="unsorted"
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml
===================================================================
diff -u -rfd1d19665518ba6781ce9e3851889c077e8efff4 -r8f2053b9a8e7a32cf70ae7788b17cc46dc59cd95
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision fd1d19665518ba6781ce9e3851889c077e8efff4)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision 8f2053b9a8e7a32cf70ae7788b17cc46dc59cd95)
@@ -127,7 +127,7 @@
 
         <set
             name="messages"
-            lazy="false"
+            lazy="true"
             inverse="false"
             cascade="all"
             sort="unsorted"
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java
===================================================================
diff -u -rfd1d19665518ba6781ce9e3851889c077e8efff4 -r8f2053b9a8e7a32cf70ae7788b17cc46dc59cd95
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	(.../Forum.java)	(revision fd1d19665518ba6781ce9e3851889c077e8efff4)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	(.../Forum.java)	(revision 8f2053b9a8e7a32cf70ae7788b17cc46dc59cd95)
@@ -252,7 +252,7 @@
 	/**
 	 * 
 	 * 
-	 * @hibernate.set lazy="false"
+	 * @hibernate.set lazy="true"
 	 *                cascade="all"
 	 *                inverse="false"
 	 *                order-by="create_date desc"
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -r8e35715613755a1ea9c9e22a374f431434dcaead -r8f2053b9a8e7a32cf70ae7788b17cc46dc59cd95
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 8e35715613755a1ea9c9e22a374f431434dcaead)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 8f2053b9a8e7a32cf70ae7788b17cc46dc59cd95)
@@ -52,62 +52,13 @@
 	private ForumToolContentHandler toolContentHandler;
 	private IRepositoryService repositoryService;
 	
-    public Forum createForum(Forum forum, Set attachments, Set topics) throws PersistenceException {
-        if (attachments != null && attachments.size() !=0) {
-            Set documents = new HashSet();
-            Iterator it = attachments.iterator();
-            while (it.hasNext()) {
-                Attachment attachment = (Attachment) it.next();
-                attachmentDao.saveOrUpdate(attachment);
-                documents.add(attachment);
-            }
-            forum.setAttachments(documents);
-        }
-        forumDao.save(forum);
-
-        //save topics of forum
-        if (topics != null && topics.size() !=0) {
-          Iterator it = topics.iterator();
-          while (it.hasNext()) {
-                Message message = (Message) it.next();
-                message.setIsAuthored(true);
-                this.createMessage(forum.getUid(), message);
-          }
-        }
+    public Forum createForum(Forum forum) throws PersistenceException {
+    	forumDao.save(forum);
         return forum;
     }
 
-    public Forum editForum(Forum forum, Set attachments, Set topics) throws PersistenceException {
-        Forum reloaded = this.getForum(forum.getUid());
-        reloaded.setTitle(forum.getTitle());
-        reloaded.setCreatedBy(forum.getCreatedBy());
-        reloaded.setLockWhenFinished(forum.getLockWhenFinished());
-        reloaded.setRunOffline(forum.getRunOffline());
-        reloaded.setAllowAnonym(forum.getAllowAnonym());
-        reloaded.setInstructions(forum.getInstructions());
-        reloaded.setOnlineInstructions(forum.getOnlineInstructions());
-        reloaded.setOfflineInstructions(forum.getOfflineInstructions());
-        if (attachments != null && attachments.size() !=0) {
-            Set documents = reloaded.getAttachments();
-            Iterator it = attachments.iterator();
-            while (it.hasNext()) {
-                Attachment attachment = (Attachment) it.next();
-                attachmentDao.saveOrUpdate(attachment);
-                documents.add(attachment);
-            }
-            forum.setAttachments(documents);
-        }
-        forumDao.saveOrUpdate(reloaded);
-
-        //save topics of forum
-        if (topics != null && topics.size() !=0) {
-          Iterator it = topics.iterator();
-          while (it.hasNext()) {
-                Message message = (Message) it.next();
-                this.createMessage(forum.getUid(), message);
-          }
-        }
-
+    public Forum editForum(Forum forum) throws PersistenceException {
+        forumDao.saveOrUpdate(forum);
         return forum;
     }
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
===================================================================
diff -u -rfd1d19665518ba6781ce9e3851889c077e8efff4 -r8f2053b9a8e7a32cf70ae7788b17cc46dc59cd95
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision fd1d19665518ba6781ce9e3851889c077e8efff4)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision 8f2053b9a8e7a32cf70ae7788b17cc46dc59cd95)
@@ -18,8 +18,8 @@
  */
 public interface IForumService {
 
-    public Forum createForum(Forum forum, Set attachments, Set topics) throws PersistenceException;
-    public Forum editForum(Forum forum, Set attachments, Set topics) throws PersistenceException;
+    public Forum createForum(Forum forum) throws PersistenceException;
+    public Forum editForum(Forum forum) throws PersistenceException;
     public Forum getForum(Long forumId) throws PersistenceException;
     public Forum getForumByContentId(Long contentID) throws PersistenceException;
     
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -r8e35715613755a1ea9c9e22a374f431434dcaead -r8f2053b9a8e7a32cf70ae7788b17cc46dc59cd95
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8e35715613755a1ea9c9e22a374f431434dcaead)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8f2053b9a8e7a32cf70ae7788b17cc46dc59cd95)
@@ -127,7 +127,7 @@
 		try {
 			forum = forumService.getForumByContentId(contentId);
 			if(forum != null){
-				topics = forumService.getTopics(forum.getUid());
+				topics = new ArrayList(forum.getMessages());
 				forumForm.setForum(forum);
 			}
 			forumForm.setToolContentID(contentId);
@@ -223,9 +223,10 @@
     public ActionForward finishTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) throws PersistenceException {
     	List topics = (List) request.getSession().getAttribute(ForumConstants.AUTHORING_TOPICS_LIST);
+    	
     	ForumForm forumForm = (ForumForm)form;
-    	//TODO: topic sequence not write
-    	forumForm.getForum().setMessages(new HashSet(topics));
+    	Forum forum = forumForm.getForum();
+    	forum.setMessages(new HashSet(topics));
     	
     	return mapping.findForward("success");
     	
@@ -245,22 +246,34 @@
 
 		ForumForm forumForm = (ForumForm)(form);
 		Forum forum = forumForm.getForum();
-		Set topics = forum.getMessages();
-		Set attachment = forum.getAttachments();
 		try {
 			forumService = getForumManager();
-			Forum persistContent = forumService.getForumByContentId(forumForm.getToolContentID());
-			if(persistContent != null && forum.getContentId().equals(persistContent.getContentId())){
-				//keep Set type attribute for persist content becuase this update only 
-				//include updating simple properties from web page(i.e. text value, list value, etc)
-				
-				//copy web page value into persist content, as above, the "Set" type value kept.
-				PropertyUtils.copyProperties(persistContent,forum);
-				forumService.editForum(persistContent,attachment,topics);
-			}else{
-				forum.setContentId(forumForm.getToolContentID());
-				forumService.createForum(forum,attachment,topics);
+			Forum forumPO = forumService.getForumByContentId(forumForm.getToolContentID());
+			if(forumPO != null && forumForm.getToolContentID().equals(forum.getContentId()) ){
+				//merge web page change into PO
+				Set msgSet = forumPO.getMessages();
+				Set attSet = forumPO.getAttachments();
+				if(forum.getMessages() != null){
+			    	if(msgSet == null){
+			    		msgSet = new HashSet();
+			    		forumPO.setMessages(msgSet);
+			    	}
+			    	//restore new topic into ForumPO message set.
+			    	Message msg;
+			    	Iterator iter = forum.getMessages().iterator();
+			    	while(iter.hasNext()){
+			    		msg = (Message) iter.next();
+			    		//new topic, then add to PO
+			    		if(msg.getUid() == null)
+			    			msgSet.add(msg);
+			    	}
+				}
+				PropertyUtils.copyProperties(forumPO,forum);
+				//copy back
+				forumPO.setAttachments(attSet);
+				forumPO.setMessages(msgSet);
 			}
+			forumService.editForum(forumPO);
 		} catch (Exception e) {
 			log.error(e);
 		}