Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml
===================================================================
diff -u -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93 -r5cf73c3c3892579e89ad206d4d04c97bda7fd949
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
@@ -151,6 +151,22 @@
             column="forum_uid"
         />
 
+        <property
+            name="replyNumber"
+            type="int"
+            update="true"
+            insert="true"
+            column="reply_number"
+        />
+
+        <property
+            name="hideFlag"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="hide_flag"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Message.xml
Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r3125084d6fc9d84ba5d3fe729bf6b61c96c67e35 -r5cf73c3c3892579e89ad206d4d04c97bda7fd949
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 3125084d6fc9d84ba5d3fe729bf6b61c96c67e35)
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
@@ -194,14 +194,13 @@
 			scope="session">
 			<forward name="success" path="tiles:/learning/forum/editTopic" />
 		</action>
-		
-		<action path="/learning/message/deleteTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			parameter="deleteTopic" 
-			scope="request">
+				
+		<action path="/learning/finish"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			parameter="finish">
 			<forward name="success" path="tiles:/learning/forum/viewForum" />
 		</action>
-		
+
 		<!-- System level actions -->
 		<action path="/index" type="org.apache.struts.actions.ForwardAction"
 			parameter="tiles:/layout" />
Index: lams_tool_forum/db/model/forum.clay
===================================================================
diff -u -rdc2c4669a29d722cfee09e59636ea9677dcdf64d -r5cf73c3c3892579e89ad206d4d04c97bda7fd949
--- lams_tool_forum/db/model/forum.clay	(.../forum.clay)	(revision dc2c4669a29d722cfee09e59636ea9677dcdf64d)
+++ lams_tool_forum/db/model/forum.clay	(.../forum.clay)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
@@ -14,7 +14,7 @@
 <table-list>
 <table alias="" name="tl_lafrum11_attachment" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="275" y="298"/>
+<table-figure-bounds height="-1" width="-1" x="132" y="286"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="">
 <column-description></column-description>
@@ -140,7 +140,7 @@
 </table>
 <table alias="" name="tl_lafrum11_forum" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="58" y="43"/>
+<table-figure-bounds height="-1" width="-1" x="168" y="-10"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="">
 <column-description></column-description>
@@ -332,7 +332,7 @@
 </table>
 <table alias="" name="tl_lafrum11_forum_user" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="536" y="486"/>
+<table-figure-bounds height="-1" width="-1" x="915" y="323"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="">
 <column-description></column-description>
@@ -390,7 +390,7 @@
 </table>
 <table alias="" name="tl_lafrum11_message" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="725" y="169"/>
+<table-figure-bounds height="-1" width="-1" x="621" y="193"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="">
 <column-description></column-description>
@@ -527,6 +527,32 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
+<column alias="" auto-increment="false" column-size="11" decimal-digits="0" default-value="" mandatory="false" name="reply_number" remarks="">
+<column-description></column-description>
+<data-type jdbc-type="4" name="INT" selected-variant-pattern="INT(%n)">
+<variant type-name-pattern="INT"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n)"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) UNSIGNED"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) ZEROFILL"/>
+<variant type-name-pattern="INT UNSIGNED"/>
+<variant type-name-pattern="INT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="INT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="hide_flag" remarks="">
+<column-description></column-description>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
+<variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+</data-type>
+</column>
 </column-list>
 <primary-key alias="" name="PRIMARY" remarks="">
 <primary-key-description></primary-key-description>
@@ -599,7 +625,7 @@
 </table>
 <table alias="" name="tl_lafrum11_message_seq" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="797" y="483"/>
+<table-figure-bounds height="-1" width="-1" x="849" y="154"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="">
 <column-description></column-description>
@@ -692,7 +718,7 @@
 </table>
 <table alias="" name="tl_lafrum11_tool_session" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="449" y="23"/>
+<table-figure-bounds height="-1" width="-1" x="550" y="10"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="">
 <column-description></column-description>
Index: lams_tool_forum/db/sql/create_lams_tool_forum.sql
===================================================================
diff -u -rdc2c4669a29d722cfee09e59636ea9677dcdf64d -r5cf73c3c3892579e89ad206d4d04c97bda7fd949
--- lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision dc2c4669a29d722cfee09e59636ea9677dcdf64d)
+++ lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
@@ -56,6 +56,8 @@
    forum_session_uid bigint,
    parent_uid bigint,
    forum_uid bigint,
+   reply_number integer,
+   hide_flag bit,
    primary key (uid)
 );
 create table tl_lafrum11_message_seq (
Index: lams_tool_forum/db/sql/table-schema.sql
===================================================================
diff -u -rdc2c4669a29d722cfee09e59636ea9677dcdf64d -r5cf73c3c3892579e89ad206d4d04c97bda7fd949
--- lams_tool_forum/db/sql/table-schema.sql	(.../table-schema.sql)	(revision dc2c4669a29d722cfee09e59636ea9677dcdf64d)
+++ lams_tool_forum/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
@@ -65,6 +65,8 @@
    forum_session_uid bigint,
    parent_uid bigint,
    forum_uid bigint,
+   reply_number integer,
+   hide_flag bit,
    primary key (uid)
 );
 create table tl_lafrum11_message_seq (
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java
===================================================================
diff -u -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93 -r5cf73c3c3892579e89ad206d4d04c97bda7fd949
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java	(.../MessageDTO.java)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java	(.../MessageDTO.java)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.lang.StringUtils;
 import org.lamsfoundation.lams.tool.forum.persistence.Message;
 
 
@@ -35,42 +36,45 @@
 	private String author;
 	private boolean hasAttachment;
 	private short level;
+	private String bodyByHtml;
+	private int threadNum;
 	
+
 	public static MessageDTO getMessageDTO(Message msg, String authorName){
 		if(msg == null)
 			return null;
 		
 		MessageDTO dto = new MessageDTO();
 		dto.setMessage(msg);
+		if(!StringUtils.isEmpty(msg.getBody()))
+			dto.setBodyByHtml(msg.getBody().replaceAll("\n","<BR>"));
+		else
+			dto.setBodyByHtml("");		
 		dto.setAuthor(authorName);
 		if(msg.getAttachments() == null || msg.getAttachments().isEmpty())
 			dto.setHasAttachment(false);
 		else
 			dto.setHasAttachment(true);
 		return dto;
 	}
+	
 	public static MessageDTO getMessageDTO(Message msg){
-		if(msg == null)
-			return null;
-		
-		MessageDTO dto = new MessageDTO();
-		dto.setMessage(msg);
-		dto.setAuthor(msg.getCreatedBy().getFirstName()+" "+msg.getCreatedBy().getLastName());
-		if(msg.getAttachments() == null || msg.getAttachments().isEmpty())
-			dto.setHasAttachment(false);
-		else
-			dto.setHasAttachment(true);
-		return dto;
+		return getMessageDTO(msg,msg.getCreatedBy().getFirstName()+" "+msg.getCreatedBy().getLastName());
 	}
-	public static Set getMessageDTO(Set msgSet,String authorName){
-		Set retSet = new HashSet();
+	
+	public static List getMessageDTO(List msgSet,String authorName){
+		List retSet = new ArrayList();
 		if(msgSet == null || msgSet.isEmpty())
 			return retSet;
 		
 		Iterator iter = msgSet.iterator();
 		while(iter.hasNext()){
 			Message msg = (Message) iter.next();
 			MessageDTO msgDto = new MessageDTO();
+			if(!StringUtils.isEmpty(msg.getBody()))
+				msgDto.setBodyByHtml(msg.getBody().replaceAll("\n","<BR>"));
+			else
+				msgDto.setBodyByHtml("");
 			if(msg.getAttachments() == null || msg.getAttachments().isEmpty())
 				msgDto.setHasAttachment(false);
 			else
@@ -90,6 +94,10 @@
 		while(iter.hasNext()){
 			Message msg = (Message) iter.next();
 			MessageDTO msgDto = new MessageDTO();
+			if(!StringUtils.isEmpty(msg.getBody()))
+				msgDto.setBodyByHtml(msg.getBody().replaceAll("\n","<BR>"));
+			else
+				msgDto.setBodyByHtml("");
 			if(msg.getAttachments() == null || msg.getAttachments().isEmpty())
 				msgDto.setHasAttachment(false);
 			else
@@ -125,5 +133,18 @@
 	public void setLevel(short level) {
 		this.level = level;
 	}
-	
+	public int getThreadNum() {
+		return threadNum;
+	}
+	public void setThreadNum(int threadNum) {
+		this.threadNum = threadNum;
+	}
+
+	public String getBodyByHtml() {
+		return bodyByHtml;
+	}
+
+	public void setBodyByHtml(String bodyByHtml) {
+		this.bodyByHtml = bodyByHtml;
+	}	
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSessionDao.java
===================================================================
diff -u -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93 -r5cf73c3c3892579e89ad206d4d04c97bda7fd949
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSessionDao.java	(.../ForumToolSessionDao.java)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSessionDao.java	(.../ForumToolSessionDao.java)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
@@ -34,5 +34,10 @@
 			return null;
 		return (ForumToolSession) list.get(0);
 	}
+	
+	public void saveOrUpdate(ForumToolSession session){
+		this.getHibernateTemplate().saveOrUpdate(session);
+		this.getHibernateTemplate().flush();
+	}
 
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml
===================================================================
diff -u -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93 -r5cf73c3c3892579e89ad206d4d04c97bda7fd949
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
@@ -151,6 +151,22 @@
             column="forum_uid"
         />
 
+        <property
+            name="replyNumber"
+            type="int"
+            update="true"
+            insert="true"
+            column="reply_number"
+        />
+
+        <property
+            name="hideFlag"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="hide_flag"
+        />
+
         <!--
             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 -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93 -r5cf73c3c3892579e89ad206d4d04c97bda7fd949
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	(.../Message.java)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	(.../Message.java)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
@@ -32,6 +32,8 @@
 	private ForumUser createdBy;
 	private ForumUser modifiedBy;
 	private Date lastReplyDate;
+	private int replyNumber;
+	private boolean hideFlag;
 
 
 	/**
@@ -313,4 +315,28 @@
 	public void setForum(Forum forum) {
 		this.forum = forum;
 	}
+	
+	/**
+	 * @hibernate.property column="reply_number"
+	 * @return
+	 */
+	public int getReplyNumber() {
+		return replyNumber;
+	}
+
+	public void setReplyNumber(int replyNumber) {
+		this.replyNumber = replyNumber;
+	}
+	/**
+	 * @hibernate.property column="hide_flag"
+	 * @return
+	 */
+	public boolean isHideFlag() {
+		return hideFlag;
+	}
+
+	public void setHideFlag(boolean hideFlag) {
+		this.hideFlag = hideFlag;
+	}
+
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java
===================================================================
diff -u -r86fab777fa621158cd635f297d3be6987b7d99f0 -r5cf73c3c3892579e89ad206d4d04c97bda7fd949
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java	(.../MessageDao.java)	(revision 86fab777fa621158cd635f297d3be6987b7d99f0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java	(.../MessageDao.java)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
@@ -53,7 +53,7 @@
 		this.getHibernateTemplate().deleteAll(list);
 	}
 
-	public List allAuthoredMessage(Long forumId) {
+	public List getAuthoredMessage(Long forumId) {
 		return findByNamedQuery("allAuthoredMessagesOfForum", forumId);
 	}
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -r86fab777fa621158cd635f297d3be6987b7d99f0 -r5cf73c3c3892579e89ad206d4d04c97bda7fd949
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 86fab777fa621158cd635f297d3be6987b7d99f0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
@@ -172,6 +172,8 @@
         
         //update last reply date for root message
         root.setLastReplyDate(new Date());
+        //update reply message number for root 
+        root.setReplyNumber(root.getReplyNumber()+1);
         messageDao.saveOrUpdate(root);
         
         return replyMessage;
@@ -417,7 +419,7 @@
 			msg = (Message) iter.next();
 			map.put(msg.getLastReplyDate(),msg);
 		}
-		return 	new ArrayList(map.values());
+		return 	MessageDTO.getMessageDTO(new ArrayList(map.values()));
 		
 	}
 	public Forum createForum(Long contentId) throws PersistenceException {
@@ -491,4 +493,13 @@
 		}
 		return seq.getRootMessage().getUid();
 	}
+
+	public List getAuthoredTopics(Long forumId) {
+		List list = messageDao.getAuthoredMessage(forumId);
+		return MessageDTO.getMessageDTO(list);
+	}
+
+	public void updateSession(ForumToolSession session) {
+		forumToolSessionDao.saveOrUpdate(session);
+	}
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
===================================================================
diff -u -r86fab777fa621158cd635f297d3be6987b7d99f0 -r5cf73c3c3892579e89ad206d4d04c97bda7fd949
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision 86fab777fa621158cd635f297d3be6987b7d99f0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
@@ -64,6 +64,11 @@
 	 * 		List of MessageDTO
 	 */
 	public List getRootTopics(Long sessionId);
+	/**
+	 * @return
+	 * 		List of MessageDTO
+	 */
+	public List getAuthoredTopics(Long forumId);
 	
 	public ForumUser getUserByUserId(Long userId);
 	public void createUser(ForumUser forumUser);
@@ -74,4 +79,5 @@
 	 * @return
 	 */
 	public Long getRootTopicId(Long topicId);
+	public void updateSession(ForumToolSession session);
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
diff -u -r86fab777fa621158cd635f297d3be6987b7d99f0 -r5cf73c3c3892579e89ad206d4d04c97bda7fd949
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision 86fab777fa621158cd635f297d3be6987b7d99f0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
@@ -24,4 +24,8 @@
 	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";
+
+	public static final int SESSION_STATUS_FINISHED = 1;
+	
+	
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties
===================================================================
diff -u -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93 -r5cf73c3c3892579e89ad206d4d04c97bda7fd949
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
@@ -26,14 +26,16 @@
 label.authoring.offline.filelist=Offline file list
 label.authoring.online.delete=Delete
 label.authoring.offline.delete=Delete
-
+label.authoring.advance.allow.edit=Allow Edit
+label.authoring.advance.use.richeditor=Allow Rich Editor
 lable.topic.title.subject=Subject
 lable.topic.title.body=Body
 lable.topic.title.update=Last post
 lable.topic.title.author=Author
 lable.topic.title.startedby=Start by
 lable.topic.title.replies=Replies
 lable.topic.subject.by=By
+label.back.to.forum=Go back to froum
 
 authoring.exception= There is a problem in forum authoring page, the reason is {0}
 #-------------------------END Authoring Labels END-----------------#
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -r86fab777fa621158cd635f297d3be6987b7d99f0 -r5cf73c3c3892579e89ad206d4d04c97bda7fd949
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 86fab777fa621158cd635f297d3be6987b7d99f0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
@@ -145,8 +145,7 @@
 		Forum forum = null;
 		try {
 			forum = forumService.getForumByContentId(contentId);
-			topics = new ArrayList(MessageDTO.getMessageDTO(forum.getMessages(), user.getFirstName() + " "
-					+ user.getLastName()));
+			topics = forumService.getAuthoredTopics(contentId);
 			forumForm.setForum(forum);
 			forumForm.setToolContentID(contentId);
 		} catch (PersistenceException e) {
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
diff -u -r3125084d6fc9d84ba5d3fe729bf6b61c96c67e35 -r5cf73c3c3892579e89ad206d4d04c97bda7fd949
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 3125084d6fc9d84ba5d3fe729bf6b61c96c67e35)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
@@ -70,9 +70,6 @@
 	  	if (param.equals("replyTopic")) {
 	  		return replyTopic(mapping, form, request, response);
 	  	}
-        if (param.equals("deleteTopic")) {
-       		return deleteTopic(mapping, form, request, response);
-        }
         if (param.equals("editTopic")) {
         	return editTopic(mapping, form, request, response);
         }
@@ -111,7 +108,7 @@
 		
 		//get all root topic to display on init page
 		List rootTopics = forumService.getRootTopics(sessionId);
-		request.setAttribute(ForumConstants.AUTHORING_TOPICS_LIST,MessageDTO.getMessageDTO(rootTopics));
+		request.setAttribute(ForumConstants.AUTHORING_TOPICS_LIST,rootTopics);
 		return mapping.findForward("success");
 	}
 	/**
@@ -136,7 +133,14 @@
 	 */
 	private ActionForward finish(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
-		//TODO
+
+		//get sessionId from HttpServletRequest
+		Long sessionId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
+		forumService = getForumManager();
+		ForumToolSession session = forumService.getSessionBySessionId(sessionId);
+		session.setStatus(ForumConstants.SESSION_STATUS_FINISHED);
+		forumService.updateSession(session);
+		
 		return mapping.findForward("success");
 	}
 
@@ -158,8 +162,8 @@
 		Long topicId = new Long(WebUtil.readLongParam(request,"topicId"));
 		
 		forumService = getForumManager();
+		//get root topic list
 		List msgDtoList = forumService.getTopicThread(topicId);
-		
 		request.setAttribute(ForumConstants.AUTHORING_TOPIC_THREAD,msgDtoList);
 		return mapping.findForward("success");
 	}
@@ -198,7 +202,7 @@
 		
 		//echo back current root topic to fourm init page
 		List rootTopics = forumService.getRootTopics(sessionId);
-		request.setAttribute(ForumConstants.AUTHORING_TOPICS_LIST,MessageDTO.getMessageDTO(rootTopics));
+		request.setAttribute(ForumConstants.AUTHORING_TOPICS_LIST,rootTopics);
 		return mapping.findForward("success");
 	}
 	/**
@@ -327,33 +331,6 @@
 		return mapping.findForward("success");
     }
 
-
-  	/**
-  	 * Delete a topic.
-  	 * 
-  	 * @param mapping
-  	 * @param form
-  	 * @param request
-  	 * @param response
-  	 * @return
-  	 * @throws PersistenceException
-  	 */
-    public ActionForward deleteTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) throws PersistenceException {
-    	
-    	Long topicId = new Long(WebUtil.readLongParam(request,"topicId"));
-		getForumManager().deleteTopic(topicId);
-		
-
-		//echo back this topic thread into page
-		forumService = getForumManager();
-		Long rootTopicId = forumService.getRootTopicId(topicId);
-		List msgDtoList = forumService.getTopicThread(rootTopicId);
-		request.setAttribute(ForumConstants.AUTHORING_TOPIC_THREAD,msgDtoList);
-		
-		return mapping.findForward("success");
-	}
-    
     /**
      * Only delete the attachemnt file for current topic.
      * 
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r3125084d6fc9d84ba5d3fe729bf6b61c96c67e35 -r5cf73c3c3892579e89ad206d4d04c97bda7fd949
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 3125084d6fc9d84ba5d3fe729bf6b61c96c67e35)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
@@ -205,7 +205,7 @@
 			name="messageForm" 
 			validate="false" 
 			parameter="editTopic" 
-			scope="request">
+			scope="session">
 			<forward name="success" path="tiles:/learning/forum/editTopic" />
 		</action>
 		<action path="/learning/updateTopic"
@@ -214,7 +214,7 @@
 			validate="true" 
 			input="tiles:/learning/forum/editTopic"
 			parameter="updateTopic" 
-			scope="request">
+			scope="session">
 			<forward name="success" path="tiles:/learning/forum/viewTopic" />
 		</action>
 		<action path="/learning/deleteAttachment"
@@ -225,12 +225,12 @@
 			scope="session">
 			<forward name="success" path="tiles:/learning/forum/editTopic" />
 		</action>
-		<action path="/learning/message/deleteTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			parameter="deleteTopic" 
-			scope="request">
+		<action path="/learning/finish"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			parameter="finish">
 			<forward name="success" path="tiles:/learning/forum/viewForum" />
 		</action>
+
 		<!-- System level actions -->
 		<action path="/index" type="org.apache.struts.actions.ForwardAction"
 			parameter="tiles:/layout" />
Index: lams_tool_forum/web/jsps/learning/message/topiclist.jsp
===================================================================
diff -u -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93 -r5cf73c3c3892579e89ad206d4d04c97bda7fd949
--- lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
+++ lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(.../topiclist.jsp)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
@@ -8,7 +8,8 @@
 		</tr>
 		<tr>
 			<th scope="col" width="50%" colspan="2"><fmt:message key="lable.topic.title.subject"/></th>
-			<th scope="col" width="25%"><fmt:message key="lable.topic.title.startedby"/></th>
+			<th scope="col" width="15%"><fmt:message key="lable.topic.title.startedby"/></th>
+			<th scope="col" width="10%"><fmt:message key="lable.topic.title.replies"/></th>
 			<th scope="col" width="25%"><fmt:message key="lable.topic.title.update"/></th>
 		</tr>
 		<c:forEach items="${topicList}" var="topic" >
@@ -30,6 +31,9 @@
 					<c:out value="${topic.author}"/>
 				</td>
 				<td>
+					<c:out value="${topic.message.replyNumber}"/>
+				</td>
+				<td>
 					<fmt:formatDate value="${topic.message.updated}" type="time" timeStyle="short" />
 					<fmt:formatDate value="${topic.message.updated}" type="date" dateStyle="full" />
 				</td>
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp
===================================================================
diff -u -r86fab777fa621158cd635f297d3be6987b7d99f0 -r5cf73c3c3892579e89ad206d4d04c97bda7fd949
--- lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision 86fab777fa621158cd635f297d3be6987b7d99f0)
+++ lams_tool_forum/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
@@ -21,7 +21,7 @@
 			<tr>
 				<td>
 					<br>
-					<c:out value="${topic.message.body}" />
+					<c:out value="${topic.bodyByHtml}" escapeXml="false" />
 				</td>
 			</tr>
 			<tr>
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
diff -u -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93 -r5cf73c3c3892579e89ad206d4d04c97bda7fd949
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
@@ -8,14 +8,17 @@
 <c:set var="newtopic">
 	<html:rewrite page="/learning/newTopic.do" />
 </c:set> 
+<c:set var="refresh">
+	<html:rewrite page="/learning/viewForum.do?toolSessionID=${param.toolSessionID}" />
+</c:set> 
 <c:set var="finish">
-	<html:rewrite page="/learning/finish.do" />
+	<html:rewrite page="/learning/finish.do?toolSessionID=${param.toolSessionID}" />
 </c:set> 
 	
 <html:button property="newtopic" onclick="javascript:location.href='${newtopic}';">
 	<fmt:message key="label.newtopic"/>
 </html:button>
-<html:button property="refresh" >
+<html:button property="refresh" onclick="javascript:location.href='${refresh}';" >
 	<fmt:message key="label.refresh"/>
 </html:button>
 <html:button property="finish" onclick="javascript:location.href='${finish}';">
Index: lams_tool_forum/web/jsps/learning/viewtopic.jsp
===================================================================
diff -u -r86fab777fa621158cd635f297d3be6987b7d99f0 -r5cf73c3c3892579e89ad206d4d04c97bda7fd949
--- lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision 86fab777fa621158cd635f297d3be6987b7d99f0)
+++ lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
@@ -1,4 +1,11 @@
 <%@ include file="/includes/taglibs.jsp" %>
 
 <html:errors property="error" />
+<c:set var="backToForum">
+	<html:rewrite page="/learning/viewForum.do?toolSessionID=${sessionScope.toolSessionID}" />
+</c:set> 
+<html:button property="backToForum" onclick="javascript:location.href='${backToForum}';">
+	<fmt:message key="label.back.to.forum"/>
+</html:button>
+<br>
 <%@ include file="/jsps/learning/message/topicview.jsp" %>
Index: lams_tool_forum/web/jsps/message/topicview.jsp
===================================================================
diff -u -r4d23938299d7cd12c95346e9abc603374b04e212 -r5cf73c3c3892579e89ad206d4d04c97bda7fd949
--- lams_tool_forum/web/jsps/message/topicview.jsp	(.../topicview.jsp)	(revision 4d23938299d7cd12c95346e9abc603374b04e212)
+++ lams_tool_forum/web/jsps/message/topicview.jsp	(.../topicview.jsp)	(revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
@@ -29,7 +29,7 @@
 		<tr>
 			<td>
 				<br>
-				<c:out value="${topic.message.body}" />
+				<c:out value="${topic.bodyByHtml}" escapeXml="false" />
 			</td>
 		</tr>
 		<tr>