Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java,v
diff -u -r1.27 -r1.28
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	7 Jun 2006 06:05:48 -0000	1.27
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	15 Jun 2006 04:04:37 -0000	1.28
@@ -354,7 +354,7 @@
     /**
       * Gets the toolSession
       *
-      * @hibernate.many-to-one
+      * @hibernate.many-to-one cascade="none"
       *	class="org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession"
       *	              column="forum_session_uid"
       *
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java,v
diff -u -r1.18 -r1.19
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java	6 Apr 2006 06:40:39 -0000	1.18
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java	15 Jun 2006 04:04:37 -0000	1.19
@@ -51,7 +51,6 @@
 	public void saveOrUpdate(Message message) {
 		message.updateModificationData();
 		this.getHibernateTemplate().saveOrUpdate(message);
-		this.getHibernateTemplate().flush();
 	}
 	
 	public void update(Message message) {
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java,v
diff -u -r1.54 -r1.55
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	14 Jun 2006 06:02:58 -0000	1.54
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	15 Jun 2006 04:04:37 -0000	1.55
@@ -659,6 +659,7 @@
 				user.setLastName(sysUser.getLastName());
 				user.setLoginName(sysUser.getLogin());
 				user.setUserId(new Long(newUserUid.longValue()));
+				this.createUser(user);
 			}
 			toolContentObj.setCreatedBy(user);
 			//save forum first
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java,v
diff -u -r1.27 -r1.28
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	13 Jun 2006 06:26:23 -0000	1.27
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	15 Jun 2006 04:04:37 -0000	1.28
@@ -78,5 +78,8 @@
 	public static final String PAGE_EDITABLE = "isPageEditable";
 
 	public static final String ROOT_TOPIC_UID = "rootUid";
+
+	public static final String ATTR_FORUM_TITLE = "title";
+	public static final String ATTR_FORUM_INSTRCUTION = "instruction";
 	
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java,v
diff -u -r1.33 -r1.34
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	13 Jun 2006 07:28:00 -0000	1.33
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	15 Jun 2006 04:04:37 -0000	1.34
@@ -187,7 +187,8 @@
 		Long forumId = forum.getUid();
 		Boolean allowEdit = new Boolean(forum.isAllowEdit());
 		Boolean allowRichEditor = new Boolean(forum.isAllowRichEditor());
-		int allowNumber = session.getForum().getLimitedChar();
+		int allowNumber = forum.getLimitedChar();
+		
 		request.getSession().setAttribute(ForumConstants.FORUM_ID, forumId);
 		request.getSession().setAttribute(ForumConstants.ALLOW_EDIT, allowEdit);
 		request.getSession().setAttribute(ForumConstants.ALLOW_RICH_EDITOR,
@@ -197,6 +198,9 @@
 		
 
 		// get all root topic to display on init page
+		request.setAttribute(ForumConstants.ATTR_FORUM_TITLE,forum.getTitle());
+		request.setAttribute(ForumConstants.ATTR_FORUM_INSTRCUTION,forum.getInstructions());
+		
 		List rootTopics = forumService.getRootTopics(sessionId);
 		request.setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, rootTopics);
 		
Index: lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/struts/Attic/tiles-defs.xml,v
diff -u -r1.26 -r1.27
--- lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	13 Jun 2006 06:26:23 -0000	1.26
+++ lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	15 Jun 2006 04:04:37 -0000	1.27
@@ -58,15 +58,12 @@
 	<!-- B: Learning -->
 	<!-- MAIN PAGE for learner -->	
 	<definition name="tiles:/learning/forum/viewForum" extends="tiles:layout">
-    	<put name="pageTitleKey" value="title.message.view"/>
     	<put name="body" value="/jsps/learning/viewforum.jsp"/>
 	</definition>
 	<definition name="tiles:/learning/forum/runOffline" extends="tiles:layout">
-    	<put name="pageTitleKey" value="title.message.view"/>
     	<put name="body" value="/jsps/learning/runoffline.jsp"/>
 	</definition>
 	<definition name="tiles:/learning/forum/defineLater" extends="tiles:layout">
-    	<put name="pageTitleKey" value="title.message.view"/>
     	<put name="body" value="/jsps/learning/definelater.jsp"/>
 	</definition>
 	
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/viewforum.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	9 Jun 2006 06:16:38 -0000	1.5
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	15 Jun 2006 04:04:37 -0000	1.6
@@ -1,5 +1,8 @@
 <%@ include file="/includes/taglibs.jsp"%>
 <c:set var="mode" value="${sessionScope.mode}" />
+<h1><c:out value="${title}" escapeXml="false"/></h1>
+<h2><c:out value="${instruction}" escapeXml="false"/></h2>
+<BR>
 <div align="center">
 	<%@ include file="/jsps/learning/message/topiclist.jsp"%>
 
Index: lams_tool_forum/web/jsps/learning/message/topiclist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topiclist.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_forum/web/jsps/learning/message/topiclist.jsp	9 Jun 2006 06:16:39 -0000	1.3
+++ lams_tool_forum/web/jsps/learning/message/topiclist.jsp	15 Jun 2006 04:04:37 -0000	1.4
@@ -1,12 +1,9 @@
+
 <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="15%"><fmt:message key="lable.topic.title.startedby"/></th>
 			<th scope="col" width="10%"><fmt:message key="lable.topic.title.replies"/></th>