Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml
===================================================================
diff -u
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml	(revision 0)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping
+>
+    <class
+        name="org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession"
+        table="tl_lafrum11_tool_session"
+    >
+
+        <id
+            name="uid"
+            column="uid"
+            type="java.lang.Long"
+        >
+            <generator class="identity">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-ForumToolSession.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <property
+            name="sessionEndDate"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            column="session_end_date"
+        />
+
+        <property
+            name="sessionStartDate"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            column="session_start_date"
+        />
+
+        <property
+            name="status"
+            type="int"
+            update="true"
+            insert="true"
+            column="status"
+        />
+
+        <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"
+        />
+
+        <property
+            name="sessionId"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            column="session_id"
+        />
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-ForumToolSession.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml
===================================================================
diff -u -r94d998767055fcfbf1a657b792dd19ce1f7edc0b -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision 94d998767055fcfbf1a657b792dd19ce1f7edc0b)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -34,6 +34,14 @@
         />
 
         <property
+            name="lastReplyDate"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            column="last_reply_date"
+        />
+
+        <property
             name="updated"
             type="java.util.Date"
             update="true"
@@ -95,7 +103,7 @@
 
         <many-to-one
             name="toolSession"
-            class="org.lamsfoundation.lams.tool.forum.persistence.ToolSession"
+            class="org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession"
             cascade="none"
             outer-join="auto"
             update="true"
Fisheye: Tag cff06c3c3492ed5b4efc013a3e4d8b0f50933b93 refers to a dead (removed) revision in file `lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ToolSession.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -rf88a2a4d76c8b1b50ef5a09a64c0564cc929cf11 -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision f88a2a4d76c8b1b50ef5a09a64c0564cc929cf11)
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -132,31 +132,58 @@
 			parameter="viewForum" scope="request">
 			<forward name="success" path="tiles:/learning/forum/viewForum" />
 		</action>
-		<action path="/learning/viewThread"
+		<action path="/learning/viewTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			parameter="viewThread" scope="request">
-			<forward name="success" path="tiles:/learning/forum/viewThread" />
+			parameter="viewTopic" scope="request">
+			<forward name="success" path="tiles:/learning/forum/viewTopic" />
 		</action>
 		<action path="/learning/newTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
 			parameter="newTopic" scope="request">
 			<forward name="success" path="tiles:/learning/forum/newTopic" />
 		</action>
-		<action path="/learning/replyTopic"
+		<action path="/learning/createTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			parameter="replyTopic" scope="request">
+			name="messageForm" validate="true" 
+			parameter="createTopic" 
+			scope="request">
+			<forward name="success" path="tiles:/learning/forum/viewForum" />
+		</action>
+		<action path="/learning/newReplyTopic"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			parameter="newReplyTopic" scope="request">
 			<forward name="success" path="tiles:/learning/forum/replyTopic" />
 		</action>
-		<action path="/learning/message/editTopic"
+		<action path="/learning/replyTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			name="messageForm" validate="true" input="tiles:/learning/message/post"
-			parameter="editTopic" scope="request">
+			name="messageForm" validate="true" 
+			parameter="replyTopic" 
+			scope="request">
+			<forward name="success" path="tiles:/learning/forum/viewTopic" />
+		</action>
+		
+		
+		<action path="/learning/editTopic"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			name="messageForm" validate="false" 
+			input="tiles:/learning/forum/viewTopic"
+			parameter="editTopic" 
+			scope="request">
 			<forward name="success" path="tiles:/learning/forum/editTopic" />
 		</action>
+		<action path="/learning/updateTopic"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			name="messageForm" validate="true" 
+			input="tiles:/learning/forum/editTopic"
+			parameter="updateTopic" 
+			scope="request">
+			<forward name="success" path="tiles:/learning/forum/viewTopic" />
+		</action>
+		
 		<action path="/learning/message/deleteTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
 			parameter="deleteTopic" scope="request">
-			<forward name="success" path="tiles:/learning/forum/editTopic" />
+			<forward name="success" path="tiles:/learning/forum/viewForum" />
 		</action>
 		
 		<!-- System level actions -->
Index: lams_tool_forum/src/java/forumApplicationContext.xml
===================================================================
diff -u -r94d998767055fcfbf1a657b792dd19ce1f7edc0b -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93
--- lams_tool_forum/src/java/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision 94d998767055fcfbf1a657b792dd19ce1f7edc0b)
+++ lams_tool_forum/src/java/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -14,7 +14,7 @@
                <value>org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml</value>
                <value>org/lamsfoundation/lams/tool/forum/persistence/Attachment.hbm.xml</value>
                <value>org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml</value>
-               <value>org/lamsfoundation/lams/tool/forum/persistence/ToolSession.hbm.xml</value>
+               <value>org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml</value>
                <value>org/lamsfoundation/lams/tool/forum/persistence/MessageSeq.hbm.xml</value>
             </list>
         </property>
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java
===================================================================
diff -u -rf88a2a4d76c8b1b50ef5a09a64c0564cc929cf11 -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java	(.../MessageDTO.java)	(revision f88a2a4d76c8b1b50ef5a09a64c0564cc929cf11)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java	(.../MessageDTO.java)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -34,6 +34,8 @@
 	private Message message;
 	private String author;
 	private boolean hasAttachment;
+	private short level;
+	
 	public static MessageDTO getMessageDTO(Message msg, String authorName){
 		if(msg == null)
 			return null;
@@ -47,6 +49,19 @@
 			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;
+	}
 	public static Set getMessageDTO(Set msgSet,String authorName){
 		Set retSet = new HashSet();
 		if(msgSet == null || msgSet.isEmpty())
@@ -104,5 +119,11 @@
 	public void setMessage(Message message) {
 		this.message = message;
 	}
+	public short getLevel() {
+		return level;
+	}
+	public void setLevel(short level) {
+		this.level = level;
+	}
 	
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml
===================================================================
diff -u
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml	(revision 0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping
+>
+    <class
+        name="org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession"
+        table="tl_lafrum11_tool_session"
+    >
+
+        <id
+            name="uid"
+            column="uid"
+            type="java.lang.Long"
+        >
+            <generator class="identity">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-ForumToolSession.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <property
+            name="sessionEndDate"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            column="session_end_date"
+        />
+
+        <property
+            name="sessionStartDate"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            column="session_start_date"
+        />
+
+        <property
+            name="status"
+            type="int"
+            update="true"
+            insert="true"
+            column="status"
+        />
+
+        <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"
+        />
+
+        <property
+            name="sessionId"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            column="session_id"
+        />
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-ForumToolSession.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.java
===================================================================
diff -u
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.java	(revision 0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.java	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -0,0 +1,106 @@
+/*
+ *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ *
+ *This program is free software; you can redistribute it and/or modify
+ *it under the terms of the GNU General Public License as published by
+ *the Free Software Foundation; either version 2 of the License, or
+ *(at your option) any later version.
+ *
+ *This program is distributed in the hope that it will be useful,
+ *but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *GNU General Public License for more details.
+ *
+ *You should have received a copy of the GNU General Public License
+ *along with this program; if not, write to the Free Software
+ *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *USA
+ *
+ *http://www.gnu.org/licenses/gpl.txt
+ */
+package org.lamsfoundation.lams.tool.forum.persistence;
+
+import java.util.Date;
+
+/**
+ * @hibernate.class table="tl_lafrum11_tool_session"
+ * @author Steve.Ni
+ * 
+ * @version $Revision$
+ */
+public class ForumToolSession {
+	private Long uid;
+	private Long sessionId;
+	private Forum forum;
+	private Date sessionStartDate;
+	private Date sessionEndDate;
+	//finish or not
+	private int status;
+	
+	/**
+	 * @hibernate.id generator-class="identity" type="java.lang.Long" column="uid"
+	 * @return Returns the learnerID.
+	 */
+	public Long getUid() {
+		return uid;
+	}
+	public void setUid(Long uuid) {
+		this.uid = uuid;
+	}
+	
+	/**
+	 * @hibernate.property column="session_end_date"
+	 * @return
+	 */
+	public Date getSessionEndDate() {
+		return sessionEndDate;
+	}
+	public void setSessionEndDate(Date sessionEndDate) {
+		this.sessionEndDate = sessionEndDate;
+	}
+	/**
+	 * @hibernate.property column="session_start_date"
+	 * 
+	 * @return
+	 */
+	public Date getSessionStartDate() {
+		return sessionStartDate;
+	}
+	public void setSessionStartDate(Date sessionStartDate) {
+		this.sessionStartDate = sessionStartDate;
+	}
+	/**
+	 * @hibernate.property
+	 * @return
+	 */
+	public int getStatus() {
+		return status;
+	}
+	public void setStatus(int status) {
+		this.status = status;
+	}
+
+	/**
+ 	 * @hibernate.many-to-one  column="forum_uid"
+ 	 * cascade="none"
+	 * @return
+	 */
+	public Forum getForum() {
+		return forum;
+	}
+	public void setForum(Forum forum) {
+		this.forum = forum;
+	}
+	/**
+	 * @hibernate.property column="session_id"
+	 * @return
+	 */
+	public Long getSessionId() {
+		return sessionId;
+	}
+	public void setSessionId(Long sessionId) {
+		this.sessionId = sessionId;
+	}
+
+
+}
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSessionDao.java
===================================================================
diff -u
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSessionDao.java	(revision 0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSessionDao.java	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -0,0 +1,38 @@
+/*
+ *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ *
+ *This program is free software; you can redistribute it and/or modify
+ *it under the terms of the GNU General Public License as published by
+ *the Free Software Foundation; either version 2 of the License, or
+ *(at your option) any later version.
+ *
+ *This program is distributed in the hope that it will be useful,
+ *but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *GNU General Public License for more details.
+ *
+ *You should have received a copy of the GNU General Public License
+ *along with this program; if not, write to the Free Software
+ *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *USA
+ *
+ *http://www.gnu.org/licenses/gpl.txt
+ */
+package org.lamsfoundation.lams.tool.forum.persistence;
+
+import java.util.List;
+
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
+
+public class ForumToolSessionDao extends HibernateDaoSupport {
+
+	private static final String SQL_QUERY_FIND_BY_SESSION_ID = "from " + ForumToolSession.class.getName() + " where session_id=?";
+	
+	public ForumToolSession getBySessionId(Long sessionId) {
+		List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_SESSION_ID,sessionId);
+		if(list == null || list.isEmpty())
+			return null;
+		return (ForumToolSession) list.get(0);
+	}
+
+}
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml
===================================================================
diff -u -r94d998767055fcfbf1a657b792dd19ce1f7edc0b -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision 94d998767055fcfbf1a657b792dd19ce1f7edc0b)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -34,6 +34,14 @@
         />
 
         <property
+            name="lastReplyDate"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            column="last_reply_date"
+        />
+
+        <property
             name="updated"
             type="java.util.Date"
             update="true"
@@ -95,7 +103,7 @@
 
         <many-to-one
             name="toolSession"
-            class="org.lamsfoundation.lams.tool.forum.persistence.ToolSession"
+            class="org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession"
             cascade="none"
             outer-join="auto"
             update="true"
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java
===================================================================
diff -u -r94d998767055fcfbf1a657b792dd19ce1f7edc0b -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	(.../Message.java)	(revision 94d998767055fcfbf1a657b792dd19ce1f7edc0b)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	(.../Message.java)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -22,7 +22,7 @@
 	private boolean isAuthored;
 	private boolean isAnonymous;
 
-	private ToolSession toolSession;
+	private ForumToolSession toolSession;
 	private Message parent;
 	private Forum forum;
 	private Set attachments;
@@ -31,7 +31,9 @@
 	private Date updated;
 	private ForumUser createdBy;
 	private ForumUser modifiedBy;
+	private Date lastReplyDate;
 
+
 	/**
 	 * Returns the object's creation date
 	 *
@@ -50,7 +52,19 @@
 	public void setCreated(Date created) {
 	    this.created = created;
 	}
+	/**
+	 * Returns this topic last reply date
+	 *
+	 * @return date
+	 * @hibernate.property column="last_reply_date"
+	 */
+	public Date getLastReplyDate() {
+		return lastReplyDate;
+	}
 
+	public void setLastReplyDate(Date lastPostDate) {
+		this.lastReplyDate = lastPostDate;
+	}
 	/**
 	 * Returns the object's date of last update
 	 *
@@ -209,19 +223,19 @@
       * Gets the toolSession
       *
       * @hibernate.many-to-one
-      *	class="org.lamsfoundation.lams.tool.forum.persistence.ToolSession"
+      *	class="org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession"
       *	              column="forum_session_uid"
       *
       */
-     public ToolSession getToolSession() {
+     public ForumToolSession getToolSession() {
          return toolSession;
      }
 
 
 	/**
 	 * @param toolSession The toolSession that this Message belongs to
      */
-    public void setToolSession(ToolSession forum) {
+    public void setToolSession(ForumToolSession forum) {
          this.toolSession = forum;
      }
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java
===================================================================
diff -u -rf88a2a4d76c8b1b50ef5a09a64c0564cc929cf11 -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java	(.../MessageDao.java)	(revision f88a2a4d76c8b1b50ef5a09a64c0564cc929cf11)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java	(.../MessageDao.java)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -15,7 +15,10 @@
  */
 public class MessageDao extends HibernateDaoSupport {
 	private static final String SQL_QUERY_FIND_ROOT_TOPICS = "from " + Message.class.getName() 
-					+ " where parent_uid is null and forum_uid=?";
+					+ " where parent_uid is null and forum_session_uid=?";
+	private static final String SQL_QUERY_FIND_TOPICS_FROM_AUTHOR = "from " + Message.class.getName()
+					+ " where is_authored = true and forum_uid=?";
+	
 	public void saveOrUpdate(Message message) {
 		message.updateModificationData();
 		this.getHibernateTemplate().saveOrUpdate(message);
@@ -52,9 +55,18 @@
 		return findByNamedQuery("allAuthoredMessagesOfForum", forumId);
 	}
 
-	public List getRootTopics(Long forumId) {
-		return this.getHibernateTemplate().find(SQL_QUERY_FIND_ROOT_TOPICS, forumId);
+	public List getRootTopics(Long sessionId) {
+		return this.getHibernateTemplate().find(SQL_QUERY_FIND_ROOT_TOPICS, sessionId);
 	}
+	public List getTopicsFromAuthor(Long forumId) {
+		return this.getHibernateTemplate().find(SQL_QUERY_FIND_TOPICS_FROM_AUTHOR, forumId);
+	}
 
+	public void deleteById(Long uid) {
+		Message msg = getById(uid);
+		if(msg != null)
+			this.getHibernateTemplate().delete(msg);
+	}
 
+
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageSeq.java
===================================================================
diff -u -rf88a2a4d76c8b1b50ef5a09a64c0564cc929cf11 -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageSeq.java	(.../MessageSeq.java)	(revision f88a2a4d76c8b1b50ef5a09a64c0564cc929cf11)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageSeq.java	(.../MessageSeq.java)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -44,6 +44,7 @@
 	}
 	/**
 	 * @hibernate.many-to-one column="root_message_uid"
+	 * 	cascade="none"
 	 */
 	public Message getRootMessage() {
 		return rootMessage;
@@ -53,6 +54,7 @@
 	}
 	/**
 	 * @hibernate.many-to-one column="message_uid"
+	 * 	cascade="none"
 	 */
 	public Message getMessage() {
 		return message;
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageSeqDao.java
===================================================================
diff -u -rf88a2a4d76c8b1b50ef5a09a64c0564cc929cf11 -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageSeqDao.java	(.../MessageSeqDao.java)	(revision f88a2a4d76c8b1b50ef5a09a64c0564cc929cf11)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageSeqDao.java	(.../MessageSeqDao.java)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -27,10 +27,29 @@
 public class MessageSeqDao extends HibernateDaoSupport {
 	private static final String SQL_QUERY_FIND_TOPIC_THREAD = "from " + MessageSeq.class.getName() 
 										+ " where root_message_uid = ?";
+	private static final String SQL_QUERY_FIND_TOPIC_ID = "from " + MessageSeq.class.getName() 
+						+ " where message_uid = ?";
 
 	public List getTopicThread(Long rootTopicId) {
 		return this.getHibernateTemplate().find(SQL_QUERY_FIND_TOPIC_THREAD,rootTopicId);
 	}
 
+	public MessageSeq getByTopicId(Long messageId) {
+		List list =  this.getHibernateTemplate().find(SQL_QUERY_FIND_TOPIC_ID,messageId);
+		if(list == null || list.isEmpty())
+			return null;
+		return (MessageSeq) list.get(0);
+	}
 
+	public void save(MessageSeq msgSeq) {
+		this.getHibernateTemplate().save(msgSeq);
+	}
+
+	public void deleteByTopicId(Long topicUid) {
+		MessageSeq seq = getByTopicId(topicUid);
+		if(seq != null)
+			this.getHibernateTemplate().delete(seq);
+	}
+
+
 }
Fisheye: Tag cff06c3c3492ed5b4efc013a3e4d8b0f50933b93 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ToolSession.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cff06c3c3492ed5b4efc013a3e4d8b0f50933b93 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ToolSession.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -r94d998767055fcfbf1a657b792dd19ce1f7edc0b -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 94d998767055fcfbf1a657b792dd19ce1f7edc0b)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -3,12 +3,15 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
+import java.util.Map.Entry;
 
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang.StringUtils;
@@ -32,11 +35,14 @@
 import org.lamsfoundation.lams.tool.exception.SessionDataExistsException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.forum.core.PersistenceException;
+import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
 import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
 import org.lamsfoundation.lams.tool.forum.persistence.AttachmentDao;
 import org.lamsfoundation.lams.tool.forum.persistence.Forum;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumDao;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumException;
+import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession;
+import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSessionDao;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumUser;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumUserDao;
 import org.lamsfoundation.lams.tool.forum.persistence.Message;
@@ -45,6 +51,7 @@
 import org.lamsfoundation.lams.tool.forum.persistence.MessageSeqDao;
 import org.lamsfoundation.lams.tool.forum.util.ForumConstants;
 import org.lamsfoundation.lams.tool.forum.util.ForumToolContentHandler;
+import org.lamsfoundation.lams.tool.forum.util.LastReplayDateComparator;
 import org.lamsfoundation.lams.tool.forum.util.TopicComparator;
 import org.lamsfoundation.lams.usermanagement.User;
 
@@ -57,11 +64,15 @@
  */
 public class ForumService implements IForumService,ToolContentManager,ToolSessionManager {
 	private static final Logger log = Logger.getLogger(ForumService.class);
-		private ForumDao forumDao;
+	//DAO variables
+	private ForumDao forumDao;
 	private AttachmentDao attachmentDao;
 	private MessageDao messageDao;
 	private MessageSeqDao messageSeqDao;
 	private ForumUserDao forumUserDao;
+	private ForumToolSessionDao toolSessionDao;
+	
+	//system level handler and service 
 	private ForumToolContentHandler toolContentHandler;
 	private IRepositoryService repositoryService;
 	
@@ -97,40 +108,75 @@
 
     }
 
-    public Message createMessage(Long forumId, Message message) throws PersistenceException {
-    	Forum forum = new Forum();
-    	forum.setUid(forumId);
+    public Message createRootTopic(Long forumId, Long sessionId, Message message) throws PersistenceException {
+    	//get Forum and ForumToolSesion
+    	Forum forum = getForumByContentId(forumId);
     	message.setForum(forum);
+    	//if topic created by author, sessionId will be null.
+    	if(sessionId != null){
+    		ForumToolSession session = getSessionBySessionId(sessionId);
+    		message.setToolSession(session);
+    	}
+    	//create message in database
         messageDao.save(message);
+        
+        //update message sequence
+        MessageSeq msgSeq = new MessageSeq();
+        msgSeq.setMessage(message);
+        msgSeq.setMessageLevel((short) 0);
+        //set itself as root
+        msgSeq.setRootMessage(message);
+        messageSeqDao.save(msgSeq);
+        
         return message;
     }
 
-     public Message editMessage(Message message) throws PersistenceException {
-        messageDao.saveOrUpdate(message);
+     public Message updateTopic(Message message) throws PersistenceException {
+    	 //update message
+    	messageDao.saveOrUpdate(message);
+    	
+    	//udate root message's lastReply date if this message
+    	//if this message is root message, then actually, it will update itself lastReplayDate
+    	MessageSeq msgSeq = messageSeqDao.getByTopicId(message.getUid());
+    	Message root = msgSeq.getRootMessage();
+        //update last reply date for root message
+        root.setLastReplyDate(new Date());
+        messageDao.saveOrUpdate(root);
+        
         return message;
     }
 
     public Message getMessage(Long messageId) throws PersistenceException {
         return (Message) messageDao.getById(messageId);
     }
 
-    public void deleteMessage(Long messageId) throws PersistenceException {
-        Message message = this.getMessage(messageId);
-        messageDao.delete(message);
+    public void deleteTopic(Long topicUid) throws PersistenceException {
+        messageDao.deleteById(topicUid);
+        messageSeqDao.deleteByTopicId(topicUid);
      }
 
-    public Message replyToMessage(Long messageId, Message replyMessage) throws PersistenceException {
-        Message message = this.getMessage(messageId);
-        replyMessage.setToolSession(message.getToolSession());
-        replyMessage.setParent(message);
+    public Message replyTopic(Long parentId, Message replyMessage) throws PersistenceException {
+    	//set parent
+        Message parent = this.getMessage(parentId);
+        replyMessage.setParent(parent);
         messageDao.saveOrUpdate(replyMessage);
-//        Set replies = message.getReplies();
-//        if (replies == null) {
-//            replies = new HashSet();
-//        }
-//        replies.add(replyMessage);
-//        message.setReplies(replies);
-        messageDao.saveOrUpdate(message);
+        
+        //get root topic and create record in MessageSeq table
+        MessageSeq parentSeq = messageSeqDao.getByTopicId(parent.getUid());
+        if(parentSeq == null){
+        	log.error("Message Sequence table is broken becuase topic " + parent +" can not get Sequence Record");
+        }
+        Message root = parentSeq.getRootMessage();
+        MessageSeq msgSeq = new MessageSeq();
+        msgSeq.setMessage(replyMessage);
+        msgSeq.setMessageLevel((short) (parentSeq.getMessageLevel() + 1));
+        msgSeq.setRootMessage(root);
+        messageSeqDao.save(msgSeq);
+        
+        //update last reply date for root message
+        root.setLastReplyDate(new Date());
+        messageDao.saveOrUpdate(root);
+        
         return replyMessage;
     }
 
@@ -348,11 +394,35 @@
 			msgSeq = (MessageSeq) iter.next();
 			map.put(msgSeq,msgSeq.getMessage());
 		}
+		return 	getSortedMessageDTO(map);
+	}
+
+
+	public List getRootTopics(Long sessionId){
+		List topicsBySession =  messageDao.getRootTopics(sessionId);
+		ForumToolSession session = getSessionBySessionId(sessionId);
+		if(session == null || session.getForum() == null){
+			log.error("Failed on getting session by given sessionID:" + sessionId);
+			throw new ForumException("Failed on getting session by given sessionID:" + sessionId);
+		}
+		List topicsFromAuthor = messageDao.getTopicsFromAuthor(session.getForum().getUid());
+		
+		//sorted by last post date
+		Message msg;
+		SortedMap map = new TreeMap(new LastReplayDateComparator());
+		Iterator iter = topicsBySession.iterator();
+		while(iter.hasNext()){
+			msg = (Message) iter.next();
+			map.put(msg.getLastReplyDate(),msg);
+		}
+		iter = topicsFromAuthor.iterator();
+		while(iter.hasNext()){
+			msg = (Message) iter.next();
+			map.put(msg.getLastReplyDate(),msg);
+		}
 		return 	new ArrayList(map.values());
+		
 	}
-	public List getRootTopics(Long forumId){
-		return messageDao.getRootTopics(forumId);
-	}
 	public Forum createForum(Long contentId) throws PersistenceException {
 		return null;
 	}
@@ -376,4 +446,27 @@
 	public void setForumUserDao(ForumUserDao forumUserDao) {
 		this.forumUserDao = forumUserDao;
 	}
+
+	public ForumToolSession getSessionBySessionId(Long sessionId) {
+		return toolSessionDao.getBySessionId(sessionId);
+	}
+	
+	/**
+	 * @param map
+	 * @return
+	 */
+	private List getSortedMessageDTO(SortedMap map) {
+		Iterator iter;
+		MessageSeq msgSeq;
+		List msgDtoList = new ArrayList();
+		iter =map.keySet().iterator();
+		while(iter.hasNext()){
+			Map.Entry entry = (Entry) iter.next();
+			msgSeq = (MessageSeq) entry.getKey();
+			MessageDTO dto = MessageDTO.getMessageDTO((Message) entry.getValue());
+			dto.setLevel(msgSeq.getMessageLevel());
+			msgDtoList.add(dto);
+		}
+		return msgDtoList;
+	}
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
===================================================================
diff -u -r94d998767055fcfbf1a657b792dd19ce1f7edc0b -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision 94d998767055fcfbf1a657b792dd19ce1f7edc0b)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -8,6 +8,7 @@
 import org.lamsfoundation.lams.tool.forum.persistence.Forum;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumUser;
 import org.lamsfoundation.lams.tool.forum.persistence.Message;
+import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession;
 
 /**
  * Created by IntelliJ IDEA.
@@ -27,13 +28,14 @@
     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 Attachment uploadInstructionFile(Long contentId, FormFile file, String type) throws PersistenceException;
+
     public Message getMessage(Long messageId) throws PersistenceException;
-    public void deleteMessage(Long messageId) throws PersistenceException;
-    public Message replyToMessage(Long parentId, Message message) throws PersistenceException;
-	public Attachment uploadInstructionFile(Long contentId, FormFile file, String type) throws PersistenceException;
+    
+    public Message createRootTopic(Long forumId, Long sessionId, Message message) throws PersistenceException ;
+    public Message updateTopic(Message message) throws PersistenceException;
+    public Message replyTopic(Long parentId, Message message) throws PersistenceException;
+    public void deleteTopic(Long messageId) throws PersistenceException;
 	/**
 	 * This method only upload the given file into system repository. It does not execute any database operation.
 	 * 
@@ -45,9 +47,26 @@
 	public Attachment uploadAttachment(FormFile file) throws PersistenceException;
 	public void deleteInstructionFile(Long contentID, Long uuID, Long versionID, String type) throws PersistenceException;
 	public void deleteFromRepository(Long uuID, Long versionID) throws PersistenceException;
-
+	
+	/** 
+	 * Get topics list by given root topic ID.  
+	 *  
+	 * @param rootTopicId
+	 * @return
+	 * 		List of MessageDTO
+	 */
 	public List getTopicThread(Long rootTopicId);
-	public List getRootTopics(Long forumId);
+	/**
+	 * Get root topics by a given sessionID value. Simultanousely, it gets back topics, which author 
+	 * posted in authoring page for this forum, which is related with the given sessionID value.
+	 * 
+	 * @param sessionId
+	 * @return
+	 * 		List of MessageDTO
+	 */
+	public List getRootTopics(Long sessionId);
+	
 	public ForumUser getUserByUserId(Long userId);
 	public void createUser(ForumUser forumUser);
+	public ForumToolSession getSessionBySessionId(Long sessionId);
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/LastReplayDateComparator.java
===================================================================
diff -u
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/LastReplayDateComparator.java	(revision 0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/LastReplayDateComparator.java	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -0,0 +1,40 @@
+/*
+ *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ *
+ *This program is free software; you can redistribute it and/or modify
+ *it under the terms of the GNU General Public License as published by
+ *the Free Software Foundation; either version 2 of the License, or
+ *(at your option) any later version.
+ *
+ *This program is distributed in the hope that it will be useful,
+ *but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *GNU General Public License for more details.
+ *
+ *You should have received a copy of the GNU General Public License
+ *along with this program; if not, write to the Free Software
+ *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *USA
+ *
+ *http://www.gnu.org/licenses/gpl.txt
+ */
+package org.lamsfoundation.lams.tool.forum.util;
+
+import java.util.Comparator;
+
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.tool.forum.persistence.Message;
+
+public class LastReplayDateComparator implements Comparator {
+
+	private static final Logger log = Logger.getLogger(LastReplayDateComparator.class);
+	
+	public int compare(Object arg0, Object arg1) {
+		if(!(arg0 instanceof Message) || !(arg1 instanceof Message)){
+			log.error("Topic is not Message instance.");
+			return 0;
+		}
+		return ((Message)arg0).getUpdated().after(((Message)arg1).getUpdated())?1:-1;
+	}
+
+}
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties
===================================================================
diff -u -rf88a2a4d76c8b1b50ef5a09a64c0564cc929cf11 -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f88a2a4d76c8b1b50ef5a09a64c0564cc929cf11)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -50,34 +50,15 @@
 #General Messages
 message.msg.maxFileSize = Max 250K
 
-## Forum
-
-forum.label.title = Tile
-forum.label.instructions = Instructions
-forum.label.onlineInstructions  = Online Instructions
-forum.label.offlineInstructions = Offline Instructions
-forum.label.onlineFile = Online Attachments
-forum.label.offlineFile = Offline Attachments
-forum.label.lockWhenFinished = Lock When Finished
-label.authoring.advance.allow.edit=Allow Learner Edit
-label.authoring.advance.use.richeditor=Rich Editor for Learner 
-forum.label.forceOffline = Force Offline
-forum.label.allowAnnomity = Allow Annomity
-forum.attachment.label.delete = Delete Attachment
-forum.topic.label.delete = Delete Topic
-forum.link.createTopic = New Topic
-##Topic
-topic.label.subject = Topic: 
-
 ##Message
 title.messageTopic.open = Topic Details
 
 title.message.add = Add Message
 title.message.open = View Message
 title.message.reply = Reply Message
 title.message.edit = Edit Message
-title.message.view=View Message
-title.message.view.thread=Message Board
+title.message.view=Message Board
+title.message.view.topic=View Message
 title.message.delete=Delete Message
 
 message.label.subject = Subject
@@ -95,6 +76,9 @@
 label.edit = Edit
 label.reply = Reply
 label.done = Done
+label.finish= Finish
+label.newtopic= New Topic
+label.refresh= Refresh
 ##Buttons
 button.upload = Upload
 button.done = Done
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -r94d998767055fcfbf1a657b792dd19ce1f7edc0b -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 94d998767055fcfbf1a657b792dd19ce1f7edc0b)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -76,6 +76,22 @@
 	  	if (param.equals("initPage")) {
        		return initPage(mapping, form, request, response);
         }
+        if (param.equals("updateContent")) {
+       		return updateContent(mapping, form, request, response);
+        }
+        if (param.equals("uploadOnlineFile")) {
+       		return uploadOnline(mapping, form, request, response);
+        }
+        if (param.equals("uploadOfflineFile")) {
+       		return uploadOffline(mapping, form, request, response);
+        }
+        if (param.equals("deleteOnlineFile")) {
+        	return deleteOnlineFile(mapping, form, request, response);
+        }
+        if (param.equals("deleteOfflineFile")) {
+        	return deleteOfflineFile(mapping, form, request, response);
+        }
+        //-----------------------Topic function ---------------------------
 	  	if (param.equals("newTopic")) {
        		return newTopic(mapping, form, request, response);
         }
@@ -100,21 +116,6 @@
         if (param.equals("finishTopic")) {
        		return finishTopic(mapping, form, request, response);
         }
-        if (param.equals("updateContent")) {
-       		return updateContent(mapping, form, request, response);
-        }
-        if (param.equals("uploadOnlineFile")) {
-       		return uploadOnline(mapping, form, request, response);
-        }
-        if (param.equals("uploadOfflineFile")) {
-       		return uploadOffline(mapping, form, request, response);
-        }
-        if (param.equals("deleteOnlineFile")) {
-        	return deleteOnlineFile(mapping, form, request, response);
-        }
-        if (param.equals("deleteOfflineFile")) {
-        	return deleteOfflineFile(mapping, form, request, response);
-        }
         return mapping.findForward("error");
 	}
 
@@ -183,6 +184,7 @@
 		message.setIsAuthored(true);
 		message.setCreated(new Date());
 		message.setUpdated(new Date());
+		message.setLastReplyDate(new Date());
 		Set attSet = null;
 		if(messageForm.getAttachmentFile() != null 
 			&&  !StringUtils.isEmpty(messageForm.getAttachmentFile().getFileName())){
@@ -208,7 +210,7 @@
 		}
 		//save message into database
 		forumService = getForumManager();
-		forumService.createMessage(forumId,message);
+		forumService.createRootTopic(forumId,null, message);
 		
 		topics.add(MessageDTO.getMessageDTO(message,user.getFirstName()+" "+user.getLastName()));
 		
@@ -227,7 +229,7 @@
 		if(topicIdx != -1){
 			MessageDTO topic = (MessageDTO) topics.remove(topicIdx);
 			if (topic != null && topic.getMessage() != null && topic.getMessage().getUid() != null) {
-				getForumManager().deleteMessage(topic.getMessage().getUid());
+				getForumManager().deleteTopic(topic.getMessage().getUid());
 			}
 			request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS_LIST,topics);
     	}
@@ -301,7 +303,7 @@
 			}
 			//save message into database
 			forumService = getForumManager();
-			forumService.editMessage(newMsg.getMessage());
+			forumService.updateTopic(newMsg.getMessage());
 		}
 		
 		request.setAttribute(ForumConstants.AUTHORING_TOPICS_INDEX,topicIndex);
@@ -333,7 +335,7 @@
 			newMsg.getMessage().setAttachments(null);
 			//save message into database
 			forumService = getForumManager();
-			forumService.editMessage(newMsg.getMessage());
+			forumService.updateTopic(newMsg.getMessage());
 			
 		}
 		request.setAttribute(ForumConstants.SUCCESS_FLAG,"ATT_SUCCESS_FLAG");
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
diff -u -rf88a2a4d76c8b1b50ef5a09a64c0564cc929cf11 -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision f88a2a4d76c8b1b50ef5a09a64c0564cc929cf11)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -1,49 +1,42 @@
 package org.lamsfoundation.lams.tool.forum.web.actions;
 
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionForm;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.NumberUtils;
-import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.tool.forum.service.IForumService;
-import org.lamsfoundation.lams.tool.forum.util.ForumConstants;
-import org.lamsfoundation.lams.tool.forum.core.GenericObjectFactoryImpl;
 import org.lamsfoundation.lams.tool.forum.core.PersistenceException;
 import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
 import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
-import org.lamsfoundation.lams.tool.forum.persistence.Forum;
+import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumUser;
 import org.lamsfoundation.lams.tool.forum.persistence.Message;
+import org.lamsfoundation.lams.tool.forum.service.IForumService;
+import org.lamsfoundation.lams.tool.forum.util.ForumConstants;
 import org.lamsfoundation.lams.tool.forum.web.forms.MessageForm;
-import org.lamsfoundation.lams.tool.forum.web.forms.ForumForm;
-import org.lamsfoundation.lams.tool.forum.permissions.Permission;
-import org.lamsfoundation.lams.tool.forum.permissions.PermissionManager;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.ServletException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 /**
- * Created by IntelliJ IDEA.
  * User: conradb
  * Date: 24/06/2005
  * Time: 10:54:09
- * To change this template use File | Settings | File Templates.
  */
 public class LearningAction extends Action {
   	private static Logger log = Logger.getLogger(LearningAction.class);
@@ -53,21 +46,30 @@
    public final ActionForward execute(ActionMapping mapping, ActionForm form,
             HttpServletRequest request, HttpServletResponse response) throws Exception {
   		String param = mapping.getParameter();
+  		//--------------Forum Level ------------------
 	  	if (param.equals("viewForum")) {
        		return viewForm(mapping, form, request, response);
         }
-	  	if (param.equals("viewThread")) {
-       		return viewThread(mapping, form, request, response);
-        }
 	  	if (param.equals("newTopic")) {
-       		return newTopic(mapping, form, request, response);
+	  		return newTopic(mapping, form, request, response);
+	  	}
+	  	if (param.equals("finish")) {
+	  		return finish(mapping, form, request, response);
+	  	}
+	  	
+	  	//--------------Topic Level ------------------
+	  	if (param.equals("viewTopic")) {
+       		return viewTopic(mapping, form, request, response);
         }
+	  	if (param.equals("createTopic")) {
+	  		return createTopic(mapping, form, request, response);
+	  	}
+	  	if (param.equals("newReplyTopic")) {
+	  		return newReplyTopic(mapping, form, request, response);
+	  	}
 	  	if (param.equals("replyTopic")) {
 	  		return replyTopic(mapping, form, request, response);
 	  	}
-	  	if (param.equals("createTopic")) {
-       		return createTopic(mapping, form, request, response);
-        }
         if (param.equals("deleteTopic")) {
        		return deleteTopic(mapping, form, request, response);
         }
@@ -80,219 +82,343 @@
         if (param.equals("deleteAttachment")) {
         	return deleteAttachment(mapping, form, request, response);
         }
+        
 		return mapping.findForward("error");
     }
-   
+	//==========================================================================================
+	// Forum level  methods
+	//==========================================================================================
+   /**
+    * Display root topics of a forum. This page will be the initial page of Learner page.
+    *  
+    */
 	private ActionForward viewForm(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
-		Long forumId = new Long(WebUtil.readLongParam(request,"forumId"));
+		//get sessionId from HttpServletRequest
+		Long sessionId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
+		//cache this sessionId into HttpSession
+		request.getSession().setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
+		
+		//Try to get ForumID according to sessionId
 		forumService = getForumManager();
-		List rootTopics = forumService.getRootTopics(forumId);
+		ForumToolSession session = forumService.getSessionBySessionId(sessionId);
+		if(session == null || session.getForum() == null){
+			log.error("Failed on getting session by given sessionID:" + sessionId);
+			return mapping.findForward("error");
+		}
+		Long forumId = session.getForum().getUid();
+		request.getSession().setAttribute(ForumConstants.FORUM_ID, forumId);
+		
+		//get all root topic to display on init page
+		List rootTopics = forumService.getRootTopics(sessionId);
 		request.setAttribute(ForumConstants.AUTHORING_TOPICS_LIST,MessageDTO.getMessageDTO(rootTopics));
 		return mapping.findForward("success");
 	}
+	/**
+	 * Display empty page for a new topic in forum
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	private ActionForward newTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+		return mapping.findForward("success");
+	}
+	/**
+	 * Learner click "finish" button in forum page, this method will turn on session status flag for this learner.
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	private ActionForward finish(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+		//TODO
+		return mapping.findForward("success");
+	}
 
-	private ActionForward viewThread(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	//==========================================================================================
+	// Topic level  methods
+	//==========================================================================================
+	
+	/**
+	 * Display read-only page for a special topic. Topic will arrange by Tree structure.
+	 * 
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	private ActionForward viewTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
 		Long topicId = new Long(WebUtil.readLongParam(request,"topicId"));
+		
 		forumService = getForumManager();
-		List topics = forumService.getTopics(topicId);
-		request.setAttribute(ForumConstants.AUTHORING_TOPICS,topics);
+		List msgDtoList = forumService.getTopicThread(topicId);
+		
+		request.setAttribute(ForumConstants.AUTHORING_TOPICS,msgDtoList);
 		return mapping.findForward("success");
 	}
-
-	private ActionForward replyTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) {
-		Long parentId = new Long(WebUtil.readLongParam(request,"parentId"));
+	/**
+	 * Create a new root topic. 
+	 * 
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 * @throws IOException
+	 * @throws ServletException
+	 * @throws PersistenceException
+	 */
+	public ActionForward createTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws IOException, ServletException, PersistenceException {
 		
 		MessageForm messageForm = (MessageForm) form;
+		
 		Message message = messageForm.getMessage();
 		message.setIsAuthored(false);
 		message.setCreated(new Date());
 		message.setUpdated(new Date());
-		Set attSet = null;
-		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();
-			attSet.add(att);
-		}
-		message.setAttachments(attSet);
-//		get login user (author)
-		HttpSession ss = SessionManager.getSession();
-		//get back login user DTO
-		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+		message.setLastReplyDate(new Date());
+		ForumUser forumUser = getCurrentUser();
+		message.setCreatedBy(forumUser);
+		message.setModifiedBy(forumUser);
+		setAttachment(messageForm, message);
 		
-		message.setCreatedBy(new ForumUser(user));
 		//save message into database
 		forumService = getForumManager();
-		forumService.replyToMessage(parentId,message);
+		Long forumId = (Long) request.getSession().getAttribute(ForumConstants.FORUM_ID);
+		Long sessionId = (Long) request.getSession().getAttribute(AttributeNames.PARAM_TOOL_SESSION_ID);
+		forumService.createRootTopic(forumId,sessionId,message);
+		
 		return mapping.findForward("success");
 	}
-	
-	private ActionForward newTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	/**
+	 * Dipslay replay topic page. Message form subject will include parent topics same subject.
+	 * 
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	private ActionForward newReplyTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
-		List topics = (List) request.getSession().getAttribute(ForumConstants.AUTHORING_TOPICS_LIST);
-		if (topics == null) {
-			topics = new ArrayList();
-		}
-		request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, topics);
+		Long parentId = new Long(WebUtil.readLongParam(request,"parentId"));
+		
+		//get parent topic, it can decide default subject of reply.
+    	MessageDTO topic = getTopic(parentId);
+    	
+    	if(topic != null && topic.getMessage() != null){
+        	//echo back current topic subject to web page
+    		MessageForm msgForm = (MessageForm)form;
+    		msgForm.getMessage().setSubject("Re:"+topic.getMessage().getSubject());
+    	}
+    	
+    	//cache this parentId in order to create reply
+    	request.setAttribute("parentId",parentId);
 		return mapping.findForward("success");
 	}
-	public ActionForward createTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) throws IOException, ServletException, PersistenceException {
+	/**
+	 * Create a replayed topic for a parent topic. 
+	 * 
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	private ActionForward replyTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+		Long parentId = new Long(WebUtil.readLongParam(request,"parentId"));
 		
-		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
-		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-		
 		MessageForm messageForm = (MessageForm) form;
 		Message message = messageForm.getMessage();
-		message.setIsAuthored(true);
+		message.setIsAuthored(false);
 		message.setCreated(new Date());
 		message.setUpdated(new Date());
-		Set attSet = null;
-		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();
-			attSet.add(att);
-		}
-		message.setAttachments(attSet);
-		message.setCreatedBy(new ForumUser(user));
+		message.setLastReplyDate(new Date());
+		ForumUser forumUser = getCurrentUser();
+		message.setCreatedBy(forumUser);
+		message.setModifiedBy(forumUser);
+		setAttachment(messageForm, message);
 		
-		if (topics == null) {
-			topics = new ArrayList();
-		}
 		//save message into database
 		forumService = getForumManager();
-		forumService.createMessage(forumId,message);
+		forumService.replyTopic(parentId,message);
 		
-		topics.add(MessageDTO.getMessageDTO(message,user.getFirstName()+" "+user.getLastName()));
-		
-		request.setAttribute(ForumConstants.SUCCESS_FLAG,"CREATE_SUCCESS");
-		request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, topics);
 		return mapping.findForward("success");
 	}
-
-    public ActionForward deleteTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) throws PersistenceException {
-    	
-    	List topics = (List) request.getSession().getAttribute(ForumConstants.AUTHORING_TOPICS_LIST);
-		String topicIndex = (String) request.getParameter(ForumConstants.AUTHORING_TOPICS_INDEX);
-		int topicIdx = NumberUtils.stringToInt(topicIndex,-1);
-
-		if(topicIdx != -1){
-			MessageDTO topic = (MessageDTO) topics.remove(topicIdx);
-			if (topic != null && topic.getMessage() != null && topic.getMessage().getUid() != null) {
-				getForumManager().deleteMessage(topic.getMessage().getUid());
-			}
-			request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS_LIST,topics);
-    	}
-		
-		request.setAttribute(ForumConstants.SUCCESS_FLAG,"DELETE_SUCCESS");
-		return mapping.getInputForward();
-	}
-    
-  	private IForumService getForumManager() {
-  	    if ( forumService == null ) {
-  	      WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
-  	      forumService = (IForumService) wac.getBean(ForumConstants.FORUM_SERVICE);
-  	    }
-  	    return forumService;
-  	}
+	/**
+	 * Display a editable form for a special topic in order to update it.
+	 * 
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 * @throws PersistenceException
+	 */
   	public ActionForward editTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) throws PersistenceException {
-    	MessageForm msgForm = (MessageForm)form;
-    	List topics = (List) request.getSession().getAttribute(ForumConstants.AUTHORING_TOPICS_LIST);
-    	String topicIndex = (String) request.getParameter(ForumConstants.AUTHORING_TOPICS_INDEX);
-		int topicIdx = NumberUtils.stringToInt(topicIndex,-1);
-		if(topicIdx != -1){
-			MessageDTO topic = (MessageDTO) topics.get(topicIdx);
-			if (topic != null) {
-				msgForm.setMessage(topic.getMessage());
-			}
-			request.setAttribute(ForumConstants.AUTHORING_TOPICS,topic);
+  		Long topicId = new Long(WebUtil.readLongParam(request,"topicId"));
+  		
+    	MessageDTO topic = getTopic(topicId);
+    	//echo current topic content to web page
+    	if(topic != null){
+    		MessageForm msgForm = (MessageForm)form;
+    		msgForm.setMessage(topic.getMessage());
     	}
-		request.setAttribute(ForumConstants.AUTHORING_TOPICS_INDEX,topicIndex);
+
     	return mapping.findForward("success");
     }
-    
-    public ActionForward updateTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+  	/**
+  	 * Update a topic.
+  	 * 
+  	 * @param mapping
+  	 * @param form
+  	 * @param request
+  	 * @param response
+  	 * @return
+  	 * @throws PersistenceException
+  	 */
+  	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);
+		Long topicId = new Long(WebUtil.readLongParam(request,"topicId"));
+		forumService = getForumManager();
 		
-		if(topicIdx != -1){
-			MessageForm messageForm = (MessageForm) form;
-			Message message = messageForm.getMessage();
-			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
-				Set attSet = attSet = new HashSet();
-				attSet.add(att);
-				newMsg.setHasAttachment(true);
-				newMsg.getMessage().setAttachments(attSet);
-			}
-			//save message into database
-			forumService = getForumManager();
-			forumService.createMessage(forumId,newMsg.getMessage());
-		}
+		MessageForm messageForm = (MessageForm) form;
+		Message message = messageForm.getMessage();
+		//get PO from database and sync with Form
+		Message messagePO = forumService.getMessage(topicId);
+		messagePO.setSubject(message.getSubject());
+		messagePO.setBody(message.getBody());
+		messagePO.setUpdated(new Date());
+		messagePO.setModifiedBy(getCurrentUser());
+		setAttachment(messageForm, messagePO);
 		
-		request.setAttribute(ForumConstants.AUTHORING_TOPICS_INDEX,topicIndex);
-		request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, topics);
-		request.setAttribute(ForumConstants.SUCCESS_FLAG,"EDIT_SUCCESS");
+		//save message into database
+		forumService.updateTopic(messagePO);
+		
 		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);
+		return mapping.findForward("success");
+	}
     
+    /**
+     * Only delete the attachemnt file for current topic.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws PersistenceException
+     */
     public ActionForward deleteAttachment(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) throws PersistenceException {
+    	//get value from HttpSession
+		Long topicId = new Long(WebUtil.readLongParam(request,"topicId"));
 		Long versionID = new Long(WebUtil.readLongParam(request,"versionID"));
 		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 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());
+		Message messagePO = forumService.getMessage(topicId);
+		messagePO.setUpdated(new Date());
+		messagePO.setModifiedBy(getCurrentUser());
+		messagePO.setAttachments(null);
+		//save message into database
+		forumService.updateTopic(messagePO);
 			
-		}
-		request.setAttribute(ForumConstants.SUCCESS_FLAG,"ATT_SUCCESS_FLAG");
-		request.setAttribute(ForumConstants.AUTHORING_TOPICS_INDEX,topicIndex);
     	return mapping.findForward("success");
     }
-    
+
+	//==========================================================================================
+	// Utility methods
+	//==========================================================================================
+	/**
+	 * @param topicId
+	 * @return
+	 */
+	private MessageDTO getTopic(Long topicId) {
+		//get Topic content according to TopicID
+		forumService = getForumManager();
+		List topics = forumService.getTopics(topicId);
+		MessageDTO topic = null;
+		if(topics != null && !topics.isEmpty())
+			topic = MessageDTO.getMessageDTO((Message) topics.get(0));
+		return topic;
+	}
+	
+	/**
+	 * Get login user information from system level session. Check it whether it exists in database or not, and save it
+	 * if it does not exists. Return an instance of PO of ForumUser.
+	 * @return
+	 * 		Current user instance
+	 */
+	private ForumUser getCurrentUser() {
+//			get login user (author)
+		HttpSession ss = SessionManager.getSession();
+		//get back login user DTO
+		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+		//check whether this user exist or not
+		ForumUser forumUser = forumService.getUserByUserId(new Long(user.getUserID().intValue()));
+		if(forumUser == null){
+			//if user not exist, create new one in database
+			forumUser = new ForumUser(user);
+			forumService.createUser(forumUser);
+		}
+		return forumUser;
+	}
+	/**
+	 * Get Forum Service.
+	 * 
+	 * @return
+	 */
+  	private IForumService getForumManager() {
+  	    if ( forumService == null ) {
+  	      WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
+  	      forumService = (IForumService) wac.getBean(ForumConstants.FORUM_SERVICE);
+  	    }
+  	    return forumService;
+  	}
+	/**
+	 * @param messageForm
+	 * @param message
+	 */
+	private void setAttachment(MessageForm messageForm, Message message) {
+		if(messageForm.getAttachmentFile() != null 
+			&&  !StringUtils.isEmpty(messageForm.getAttachmentFile().getFileName())){
+			forumService = getForumManager();
+			Attachment att = forumService.uploadAttachment(messageForm.getAttachmentFile());
+			//only allow one attachment, so replace whatever
+			Set attSet = attSet = new HashSet();
+			attSet.add(att);
+			message.setAttachments(attSet);
+		}
+	}
 }
Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/service/ForumManagerImplTest.java
===================================================================
diff -u -r24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86 -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93
--- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/service/ForumManagerImplTest.java	(.../ForumManagerImplTest.java)	(revision 24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86)
+++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/service/ForumManagerImplTest.java	(.../ForumManagerImplTest.java)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -122,7 +122,7 @@
       message.setBody("MODIFIED BODY");
       message.setIsAnonymous(false);
 
-      forumManager.editMessage(message);
+      forumManager.updateTopic(message);
       message = forumManager.getMessage(message.getUid());
       assertEquals(message.getToolSession(), forum);
       assertEquals(message.getCreatedBy(), new Long("1002"));
@@ -131,7 +131,7 @@
       assertEquals(message.getSubject(), "MODIFIED SUBJECT");
       assertEquals(message.getBody(), "MODIFIED BODY");
 
-      forumManager.deleteMessage(message.getUid());
+      forumManager.deleteTopic(message.getUid());
 
       forumManager.deleteForum(forum.getUid());
       try {
@@ -154,7 +154,7 @@
       assertEquals(reloaded.getSubject(), "TEST");
       assertEquals(reloaded.getBody(), "TEST");
 
-      Message reply = forumManager.replyToMessage(message.getUid(), this.getMessage(new Long("1008"), "REPLY MESSAGE", "REPLY MESSAGE", true, false));
+      Message reply = forumManager.replyTopic(message.getUid(), this.getMessage(new Long("1008"), "REPLY MESSAGE", "REPLY MESSAGE", true, false));
       assertNotNull("Message Id is null", reply.getUid());
       reply = forumManager.getMessage(reply.getUid());
       assertEquals(message.getToolSession(), forum);
@@ -170,7 +170,7 @@
 
       assertTrue("original message does not contain reply message in its reply set", reloadedReplies.contains(reply));
 
-      forumManager.deleteMessage(message.getUid());
+      forumManager.deleteTopic(message.getUid());
       try {
         forumManager.getMessage(reply.getUid());
         fail("getMessage should have barfed for non existing message");
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -rf88a2a4d76c8b1b50ef5a09a64c0564cc929cf11 -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision f88a2a4d76c8b1b50ef5a09a64c0564cc929cf11)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -164,31 +164,55 @@
 			parameter="viewForum" scope="request">
 			<forward name="success" path="tiles:/learning/forum/viewForum" />
 		</action>
-		<action path="/learning/viewThread"
+		<action path="/learning/viewTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			parameter="viewThread" scope="request">
-			<forward name="success" path="tiles:/learning/forum/viewThread" />
+			parameter="viewTopic" scope="request">
+			<forward name="success" path="tiles:/learning/forum/viewTopic" />
 		</action>
 		<action path="/learning/newTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
 			parameter="newTopic" scope="request">
 			<forward name="success" path="tiles:/learning/forum/newTopic" />
 		</action>
-		<action path="/learning/replyTopic"
+		<action path="/learning/createTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			parameter="replyTopic" scope="request">
+			name="messageForm" validate="true" 
+			parameter="createTopic" 
+			scope="request">
+			<forward name="success" path="tiles:/learning/forum/viewForum" />
+		</action>
+		<action path="/learning/newReplyTopic"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			parameter="newReplyTopic" scope="request">
 			<forward name="success" path="tiles:/learning/forum/replyTopic" />
 		</action>
-		<action path="/learning/message/editTopic"
+		<action path="/learning/replyTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			name="messageForm" validate="true" input="tiles:/learning/message/post"
-			parameter="editTopic" scope="request">
+			name="messageForm" validate="true" 
+			parameter="replyTopic" 
+			scope="request">
+			<forward name="success" path="tiles:/learning/forum/viewTopic" />
+		</action>
+		<action path="/learning/editTopic"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			name="messageForm" validate="false" 
+			input="tiles:/learning/forum/viewTopic"
+			parameter="editTopic" 
+			scope="request">
 			<forward name="success" path="tiles:/learning/forum/editTopic" />
 		</action>
+		<action path="/learning/updateTopic"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			name="messageForm" validate="true" 
+			input="tiles:/learning/forum/editTopic"
+			parameter="updateTopic" 
+			scope="request">
+			<forward name="success" path="tiles:/learning/forum/viewTopic" />
+		</action>
 		<action path="/learning/message/deleteTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
 			parameter="deleteTopic" scope="request">
-			<forward name="success" path="tiles:/learning/forum/editTopic" />
+			<forward name="success" path="tiles:/learning/forum/viewForum" />
 		</action>
 		<!-- System level actions -->
 		<action path="/index" type="org.apache.struts.actions.ForwardAction"
Index: lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -rf88a2a4d76c8b1b50ef5a09a64c0564cc929cf11 -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93
--- lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision f88a2a4d76c8b1b50ef5a09a64c0564cc929cf11)
+++ lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -48,9 +48,9 @@
     	<put name="body" value="/jsps/learning/viewforum.jsp"/>
 	</definition>
 	
-	<definition name="tiles:/learning/forum/viewThread" extends="tiles:layout">
-    	<put name="pageTitleKey" value="title.message.view.thread"/>
-    	<put name="body" value="/jsps/learning/viewthread.jsp"/>
+	<definition name="tiles:/learning/forum/viewTopic" extends="tiles:layout">
+    	<put name="pageTitleKey" value="title.message.view.topic"/>
+    	<put name="body" value="/jsps/learning/viewtopic.jsp"/>
 	</definition>
 	
     <definition name="tiles:/learning/forum/newTopic" extends="tiles:layout">
Index: lams_tool_forum/web/jsps/learning/create.jsp
===================================================================
diff -u -rf88a2a4d76c8b1b50ef5a09a64c0564cc929cf11 -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93
--- lams_tool_forum/web/jsps/learning/create.jsp	(.../create.jsp)	(revision f88a2a4d76c8b1b50ef5a09a64c0564cc929cf11)
+++ lams_tool_forum/web/jsps/learning/create.jsp	(.../create.jsp)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -5,7 +5,7 @@
 <html:form action="/learning/createTopic.do" focus="message.subject"
 	onsubmit="return validateMessageForm(this);"  enctype="multipart/form-data">
 <fieldset>
-<%@ include file="/jsps/message/topicform.jsp" %>
+<%@ include file="/jsps/learning/message/topicform.jsp" %>
  </fieldset>
  </html:form>
 </div>
Index: lams_tool_forum/web/jsps/learning/message/topiceditform.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -0,0 +1,51 @@
+
+<table width="80%" cellspacing="8" align="CENTER" class="forms">
+	<tr>
+		<td valign="MIDDLE"><b><bean:message key="message.label.subject" /></b></td>
+		<td valign="MIDDLE"><b class="required">*</b><html:text size="30"
+			 tabindex="1" property="message.subject" /> 
+			 <html:errors property="message.subject" /></td>
+	</tr>
+	<tr>
+		<td valign="MIDDLE"><b><bean:message key="message.label.body" /></b></td>
+		<td valign="MIDDLE"><b class="required">*</b><html:textarea rows="10" cols="60"
+			tabindex="2" property="message.body" /> 
+			<BR><html:errors property="message.body" /></td>
+	</tr>
+	<tr>
+		<td>
+			<b><bean:message key="message.label.attachment" /></b>
+		</td>
+		<td valign="MIDDLE">&nbsp;
+			<c:if test="${topic.hasAttachment}">
+				<c:forEach var="file" items="${topic.message.attachments}">
+					<c:set var="downloadURL">
+							<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true"/>
+					</c:set>
+					<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+						<c:out value="${file.fileName}" />
+					</a>
+					<c:set var="deleteURL">
+							<html:rewrite page="/authoring/deleteAttachment.do?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&topicIndex=${topicIndex}"/>
+					</c:set>
+					&nbsp;
+					<a href="<c:out value='${deleteURL}'/>">
+						<fmt:message key="label.delete" />
+					</a>					
+				</c:forEach>
+			</c:if>
+			<c:if test="${not topic.hasAttachment}">
+				<html:file tabindex="3"		property="attachmentFile" /> <html:errors	property="message.attachment" />
+			</c:if>
+		</td>
+	</tr>
+	<tr>
+		<td>&nbsp;&nbsp;
+			<html:submit>
+				<bean:message key="button.submit" />
+			</html:submit>
+		</td>
+		<td>
+		</td>
+	</tr>
+</table>
Index: lams_tool_forum/web/jsps/learning/message/topicform.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/learning/message/topicform.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/learning/message/topicform.jsp	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -0,0 +1,28 @@
+<table width="80%" cellspacing="8" align="CENTER" class="forms">
+	<tr>
+		<td valign="MIDDLE"><b><bean:message key="message.label.subject" /></b></td>
+		<td valign="MIDDLE"><b class="required">*</b><html:text size="30"
+			 tabindex="1" property="message.subject" /> 
+			 <html:errors property="message.subject" /></td>
+	</tr>
+	<tr>
+		<td valign="MIDDLE"><b><bean:message key="message.label.body" /></b></td>
+		<td valign="TOP"><b class="required">*</b><html:textarea rows="10" cols="60"
+			tabindex="2" property="message.body" /> 
+			<BR><html:errors property="message.body" /></td>
+	</tr>
+	<tr>
+		<td valign="MIDDLE"><b><bean:message key="message.label.attachment" /></b></td>
+		<td valign="MIDDLE">
+			&nbsp;&nbsp;<html:file tabindex="3"
+				property="attachmentFile" /> <html:errors
+				property="message.attachment" />
+		</td>
+	</tr>
+		<td>&nbsp;&nbsp;
+			<html:submit>
+				<bean:message key="button.submit" />
+			</html:submit>
+		</td>
+	</tr>
+</table>
Index: lams_tool_forum/web/jsps/learning/message/topiclist.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -0,0 +1,41 @@
+<div align="center">
+<div id="topiclist">
+	<div id="datatablecontainer">
+	<table width="100%" align="CENTER" 	class="form">
+		<tr>
+			<td valign="MIDDLE"><b>Topic</b></td>
+			<td colspan="3" />
+		</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="25%"><fmt:message key="lable.topic.title.update"/></th>
+		</tr>
+		<c:forEach items="${topicList}" var="topic" >
+			<tr>
+				<td valign="MIDDLE" width="48%">
+					<c:set var="viewtopic">
+						<html:rewrite page="/learning/viewTopic.do?topicId=${topic.message.uid}&create=${topic.message.created.time}" />
+					</c:set> 
+					<html:link href="${viewtopic}">
+						<c:out value="${topic.message.subject}" />
+					</html:link>
+				</td>
+				<td width="2%">
+					<c:if test="${topic.hasAttachment}">
+						<img src="<html:rewrite page="/images/paperclip.gif"/>">
+					</c:if>
+				</td>
+				<td>
+					<c:out value="${topic.author}"/>
+				</td>
+				<td>
+					<fmt:formatDate value="${topic.message.updated}" type="time" timeStyle="short" />
+					<fmt:formatDate value="${topic.message.updated}" type="date" dateStyle="full" />
+				</td>
+			</tr>
+		</c:forEach>
+	</table>
+	</div>
+</div>
+</div>
Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -0,0 +1,28 @@
+<table width="80%" cellspacing="8" align="CENTER" class="forms">
+	<tr>
+		<td valign="MIDDLE"><b><bean:message key="message.label.subject" /></b></td>
+		<td valign="MIDDLE"><b class="required">*</b><html:text size="30"
+			 tabindex="1" property="message.subject" /> 
+			 <html:errors property="message.subject" /></td>
+	</tr>
+	<tr>
+		<td valign="MIDDLE"><b><bean:message key="message.label.body" /></b></td>
+		<td valign="TOP"><b class="required">*</b><html:textarea rows="10" cols="60"
+			tabindex="2" property="message.body" /> 
+			<BR><html:errors property="message.body" /></td>
+	</tr>
+	<tr>
+		<td valign="MIDDLE"><b><bean:message key="message.label.attachment" /></b></td>
+		<td valign="MIDDLE">
+			&nbsp;&nbsp;<html:file tabindex="3"
+				property="attachmentFile" /> <html:errors
+				property="message.attachment" />
+		</td>
+	</tr>
+		<td>&nbsp;&nbsp;
+			<html:submit>
+				<bean:message key="button.submit" />
+			</html:submit>
+		</td>
+	</tr>
+</table>
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/learning/message/topicview.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/learning/message/topicview.jsp	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -0,0 +1,58 @@
+<div align="center">
+<div id="topicview">
+	<div id="datatablecontainer">
+	<BR>
+	<table width="100%" align="CENTER" class="form" border="0" cellspacing="0">
+		<tr>
+			<th valign="MIDDLE" scope="col" >
+				<span style="font-size:25px"><c:out value="${topic.message.subject}" /></span>
+			</th>
+		</tr>
+		<tr>
+			<th scope="col" >
+				<fmt:message key="lable.topic.subject.by"/> <c:out value="${topic.author}"/> - 
+				<fmt:formatDate value="${topic.message.created}" type="time" timeStyle="short" />
+				<fmt:formatDate value="${topic.message.created}" type="date" dateStyle="full" />
+			</th>
+		</tr>
+		<tr>
+			<td>
+				<br>
+				<c:out value="${topic.message.body}" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<br>
+				<c:forEach var="file" items="${topic.message.attachments}">
+					<c:set var="downloadURL">
+								<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true"/>
+						</c:set>
+						<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+							<c:out value="${file.fileName}" />
+						</a>
+				</c:forEach>
+			</td>
+		</tr>
+		<tr>
+			<td align="right">
+				<br>
+				<c:set var="edittopic">
+					<html:rewrite page="/learning/editTopic.do?topicId=${topic.message.uid}&create=${topic.message.created.time}" />
+				</c:set> 
+				<html:link href="${edittopic}">
+					<b><fmt:message key="label.edit" /></b>
+				</html:link>
+				
+				<c:set var="replytopic">
+					<html:rewrite page="/learning/replyTopic.do?parentId=${topic.message.uid}" />
+				</c:set> 
+				<html:link href="${replytopic}">
+					<b><fmt:message key="label.reply" /></b>
+				</html:link>
+			</td>
+		</tr>
+	</table>
+	</div>
+</div>
+</div>
Index: lams_tool_forum/web/jsps/learning/reply.jsp
===================================================================
diff -u -rf88a2a4d76c8b1b50ef5a09a64c0564cc929cf11 -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93
--- lams_tool_forum/web/jsps/learning/reply.jsp	(.../reply.jsp)	(revision f88a2a4d76c8b1b50ef5a09a64c0564cc929cf11)
+++ lams_tool_forum/web/jsps/learning/reply.jsp	(.../reply.jsp)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -5,7 +5,7 @@
 <html:form action="/learning/replyTopic.do" focus="message.subject"
 	onsubmit="return validateMessageForm(this);"  enctype="multipart/form-data">
 <fieldset>
-<%@ include file="/jsps/message/topicreplyform.jsp" %>
+<%@ include file="/jsps/learning/message/topicreplyform.jsp" %>
  </fieldset>
  </html:form>
 </div>
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
diff -u -rf88a2a4d76c8b1b50ef5a09a64c0564cc929cf11 -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision f88a2a4d76c8b1b50ef5a09a64c0564cc929cf11)
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -2,8 +2,22 @@
 
 <html:errors property="error" />
 <div align="center">
-<script lang="javascript">
-var popFobidden = true
-</script>
-	<%@ include file="/jsps/message/topiclist.jsp" %>
+	<%@ include file="/jsps/learning/message/topiclist.jsp" %>
 </div>
+<br>
+<c:set var="newtopic">
+	<html:rewrite page="/learning/newTopic.do" />
+</c:set> 
+<c:set var="finish">
+	<html:rewrite page="/learning/finish.do" />
+</c:set> 
+	
+<html:button property="newtopic" onclick="javascript:location.href='${newtopic}';">
+	<fmt:message key="label.newtopic"/>
+</html:button>
+<html:button property="refresh" >
+	<fmt:message key="label.refresh"/>
+</html:button>
+<html:button property="finish" onclick="javascript:location.href='${finish}';">
+	<fmt:message key="label.finish"/>
+</html:button>
\ No newline at end of file
Fisheye: Tag cff06c3c3492ed5b4efc013a3e4d8b0f50933b93 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/learning/viewthread.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/learning/viewtopic.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/learning/viewtopic.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/learning/viewtopic.jsp	(revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
@@ -0,0 +1,6 @@
+<%@ include file="/includes/taglibs.jsp" %>
+
+<html:errors property="error" />
+<div align="center">
+	<%@ include file="/jsps/learning/message/topicview.jsp" %>
+</div>