Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml
===================================================================
diff -u -re280cd832df020c33df6730fbee453add9e6caee -r427a3b63491fb2f3206a785705ac247af49e1360
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision e280cd832df020c33df6730fbee453add9e6caee)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision 427a3b63491fb2f3206a785705ac247af49e1360)
@@ -130,8 +130,8 @@
         <set
             name="messages"
             lazy="true"
-            inverse="false"
-            cascade="save-update"
+            inverse="true"
+            cascade="none"
             sort="unsorted"
             order-by="create_date desc"
         >
Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r71a37d456ee2d1d277774c125ac645ef7f06fa00 -r427a3b63491fb2f3206a785705ac247af49e1360
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 71a37d456ee2d1d277774c125ac645ef7f06fa00)
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 427a3b63491fb2f3206a785705ac247af49e1360)
@@ -102,7 +102,7 @@
 			parameter="editTopic"
 			scope="session">
 			<forward name="success" path="/jsps/authoring/message/edit.jsp" />
-			<forward name="forbidden" path="tiles:/authoring/forum/forbiddenEditTopic" />
+			<forward name="forbidden" path="/jsps/authoring/message/forbiddenedit.jsp" />
 		</action>
 		
 		<action path="/authoring/deleteAttachment"
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml
===================================================================
diff -u -re280cd832df020c33df6730fbee453add9e6caee -r427a3b63491fb2f3206a785705ac247af49e1360
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision e280cd832df020c33df6730fbee453add9e6caee)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision 427a3b63491fb2f3206a785705ac247af49e1360)
@@ -130,8 +130,8 @@
         <set
             name="messages"
             lazy="true"
-            inverse="false"
-            cascade="save-update"
+            inverse="true"
+            cascade="none"
             sort="unsorted"
             order-by="create_date desc"
         >
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java
===================================================================
diff -u -re280cd832df020c33df6730fbee453add9e6caee -r427a3b63491fb2f3206a785705ac247af49e1360
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	(.../Forum.java)	(revision e280cd832df020c33df6730fbee453add9e6caee)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	(.../Forum.java)	(revision 427a3b63491fb2f3206a785705ac247af49e1360)
@@ -372,11 +372,12 @@
 	}
 
 	/**
+	 * NOTE: The reason that relation don't use save-update to persist message is MessageSeq table need save 
+	 * a record as well.   
 	 * 
-	 * 
 	 * @hibernate.set lazy="true"
-	 *                inverse="false"
-	 *                cascade="save-update"
+	 *                inverse="true"
+	 *                cascade="none"
 	 *                order-by="create_date desc"
 	 * @hibernate.collection-key column="forum_uid"
 	 * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.forum.persistence.Message"
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -r71a37d456ee2d1d277774c125ac645ef7f06fa00 -r427a3b63491fb2f3206a785705ac247af49e1360
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 71a37d456ee2d1d277774c125ac645ef7f06fa00)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 427a3b63491fb2f3206a785705ac247af49e1360)
@@ -661,13 +661,17 @@
 				user.setUserId(new Long(newUserUid.longValue()));
 			}
 			toolContentObj.setCreatedBy(user);
+			//save forum first
+			forumDao.saveOrUpdate(toolContentObj);
 			
+			//save all authoring message one by one.
 			//reset all resourceItem createBy user
 			Set<Message> items = toolContentObj.getMessages();
 			for(Message item:items){
 				item.setCreatedBy(user);
+				item.setIsAuthored(true);
+				createRootTopic(toolContentObj.getUid(),null,item);
 			}
-			forumDao.saveOrUpdate(toolContentObj);
 		} catch (ImportToolContentException e) {
 			throw new ToolException(e);
 		}
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java
===================================================================
diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -r427a3b63491fb2f3206a785705ac247af49e1360
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java	(.../MessageForm.java)	(revision d9c7ddef141d19423b6ab2914d153c2cb748f187)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java	(.../MessageForm.java)	(revision 427a3b63491fb2f3206a785705ac247af49e1360)
@@ -24,7 +24,9 @@
 /* $$Id$$ */	
 package org.lamsfoundation.lams.tool.forum.web.forms;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
+import org.apache.poi.util.StringUtil;
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
@@ -64,13 +66,13 @@
      */
     public ActionErrors validate(ActionMapping mapping,
                                  javax.servlet.http.HttpServletRequest request) {
-        ActionErrors errors = super.validate(mapping, request);
+        ActionErrors errors = new ActionErrors(); 
         try{
-            if ("".equals(message.getSubject())) {
+            if (StringUtils.isBlank(message.getSubject())) {
                ActionMessage error = new ActionMessage("error.valueReqd");
                errors.add("message.subject", error);
             }
-            if ("".equals(message.getBody())) {
+            if (StringUtils.isBlank(message.getBody())) {
             	ActionMessage error = new ActionMessage("error.valueReqd");
                errors.add("message.body", error);
             }
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r71a37d456ee2d1d277774c125ac645ef7f06fa00 -r427a3b63491fb2f3206a785705ac247af49e1360
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 71a37d456ee2d1d277774c125ac645ef7f06fa00)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 427a3b63491fb2f3206a785705ac247af49e1360)
@@ -116,7 +116,7 @@
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="messageForm" 
 			validate="true"
-			input="tiles:/authoring/forum/newTopic" 
+			input="/jsps/authoring/message/create.jsp" 
 			parameter="createTopic"
 			scope="request">
 			<forward name="success" path="/jsps/authoring/message/create.jsp" />
@@ -141,7 +141,7 @@
 			parameter="editTopic"
 			scope="session">
 			<forward name="success" path="/jsps/authoring/message/edit.jsp" />
-			<forward name="forbidden" path="tiles:/authoring/forum/forbiddenEditTopic" />
+			<forward name="forbidden" path="/jsps/authoring/message/forbiddenedit.jsp" />
 		</action>
 		<action path="/authoring/deleteAttachment"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
Index: lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r71a37d456ee2d1d277774c125ac645ef7f06fa00 -r427a3b63491fb2f3206a785705ac247af49e1360
--- lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 71a37d456ee2d1d277774c125ac645ef7f06fa00)
+++ lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 427a3b63491fb2f3206a785705ac247af49e1360)
@@ -74,12 +74,12 @@
     	<put name="pageTitleKey" value="title.message.edit"/>
     	<put name="body" value="/jsps/authoring/message/edit.jsp"/>
 	</definition>
-	-->
 	<definition name="tiles:/authoring/forum/forbiddenEditTopic" extends="tiles:layout">
     	<put name="pageTitleKey" value="title.message.edit"/>
     	<put name="body" value="/jsps/authoring/message/forbiddenedit.jsp"/>
 	</definition>
 	
+	-->
 	<!-- E: Authoring -->
 
 	<!-- B: Learning -->
Index: lams_tool_forum/web/common/messages.jsp
===================================================================
diff -u -r71a37d456ee2d1d277774c125ac645ef7f06fa00 -r427a3b63491fb2f3206a785705ac247af49e1360
--- lams_tool_forum/web/common/messages.jsp	(.../messages.jsp)	(revision 71a37d456ee2d1d277774c125ac645ef7f06fa00)
+++ lams_tool_forum/web/common/messages.jsp	(.../messages.jsp)	(revision 427a3b63491fb2f3206a785705ac247af49e1360)
@@ -2,7 +2,7 @@
 <logic:messagesPresent>
     <div class="error" id="errorMessages">
         <html:messages id="error">
-            <html:img page="/includes/images/iconWarning.gif" 
+            <html:img page="/images/iconWarning.gif" 
                styleClass="icon"/>
             <c:out value="${error}" escapeXml="false"/><br/>
         </html:messages>
@@ -13,7 +13,7 @@
 <logic:messagesPresent message="true">
     <div class="message" id="successMessages">
         <html:messages id="message" message="true">
-            <html:img page="/includes/images/iconInformation.gif" styleClass="icon"/>
+            <html:img page="/images/iconInformation.gif" styleClass="icon"/>
             <c:out value="${message}" escapeXml="false"/><br/>
         </html:messages>
     </div>
Index: lams_tool_forum/web/images/iconInformation.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_forum/web/images/iconWarning.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
diff -u -r71a37d456ee2d1d277774c125ac645ef7f06fa00 -r427a3b63491fb2f3206a785705ac247af49e1360
--- lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision 71a37d456ee2d1d277774c125ac645ef7f06fa00)
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision 427a3b63491fb2f3206a785705ac247af49e1360)
@@ -51,7 +51,7 @@
 	</tr>
 	<tr>
 		<td colspan="2" align="left">
-			<a href="javascript:showMessage('<html:rewrite page="/authoring/newTopic.do"/>');" class="button">
+			<a href="javascript:showMessage('<html:rewrite page="/authoring/newTopic.do"/>');" style="float:left;width:150px"  class="button">
 				<fmt:message key="label.authoring.create.new.topic" />
 			</a>
 		</td>
Index: lams_tool_forum/web/jsps/authoring/message/edit.jsp
===================================================================
diff -u -r71a37d456ee2d1d277774c125ac645ef7f06fa00 -r427a3b63491fb2f3206a785705ac247af49e1360
--- lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision 71a37d456ee2d1d277774c125ac645ef7f06fa00)
+++ lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision 427a3b63491fb2f3206a785705ac247af49e1360)
@@ -9,15 +9,13 @@
 			<tr>
 				<td>
 					<div align="center">
-						<div align="center">
-							<%@ include file="/common/messages.jsp" %>
-							<html:form action="/authoring/updateTopic.do" focus="message.subject" enctype="multipart/form-data">
-								<fieldset>
-									<input type="hidden" name="topicIndex" value="<c:out value="${topicIndex}"/>">
-									<%@ include file="/jsps/message/topiceditform.jsp"%>
-								</fieldset>
-							</html:form>
-						</div>
+						<%@ include file="/common/messages.jsp"%>
+						<html:form action="/authoring/updateTopic.do" focus="message.subject" enctype="multipart/form-data">
+							<fieldset>
+								<input type="hidden" name="topicIndex" value="<c:out value="${topicIndex}"/>">
+								<%@ include file="/jsps/message/topiceditform.jsp"%>
+							</fieldset>
+						</html:form>
 					</div>
 				</td>
 			</tr>
Index: lams_tool_forum/web/jsps/authoring/message/forbiddenedit.jsp
===================================================================
diff -u -r7e5622f2a1facf741b442bd53556f769b51433b2 -r427a3b63491fb2f3206a785705ac247af49e1360
--- lams_tool_forum/web/jsps/authoring/message/forbiddenedit.jsp	(.../forbiddenedit.jsp)	(revision 7e5622f2a1facf741b442bd53556f769b51433b2)
+++ lams_tool_forum/web/jsps/authoring/message/forbiddenedit.jsp	(.../forbiddenedit.jsp)	(revision 427a3b63491fb2f3206a785705ac247af49e1360)
@@ -1 +1,19 @@
-You are not the topic author, permission denied to edit it. Sorry.
\ No newline at end of file
+<%@ include file="/common/taglibs.jsp"%>
+<html>
+	<head>
+		<%@ include file="/common/header.jsp"%>
+	</head>
+	<body class="tabpart">
+		<table class="forms">
+			<!-- Basic Info Form-->
+			<tr>
+				<td>
+					<div align="center">
+						<h2>You are not the topic author, permission denied to edit it. Sorry.</h2>
+					</div>
+				</td>
+			</tr>
+		</table>
+
+	</body>
+</html>
Index: lams_tool_forum/web/jsps/message/topiceditform.jsp
===================================================================
diff -u -r71a37d456ee2d1d277774c125ac645ef7f06fa00 -r427a3b63491fb2f3206a785705ac247af49e1360
--- lams_tool_forum/web/jsps/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision 71a37d456ee2d1d277774c125ac645ef7f06fa00)
+++ lams_tool_forum/web/jsps/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision 427a3b63491fb2f3206a785705ac247af49e1360)
@@ -2,20 +2,19 @@
 <table width="80%" cellspacing="8" border="0" align="left" class="innerforms">
 	<tr>
 		<td>
-			<b><bean:message key="message.label.subject" /></b>
+			<b><bean:message key="message.label.subject" /><b class="required">*</b></b>
 		</td>
 		<td>
-			<b class="required">*</b>
 			<html:text size="30" tabindex="1" property="message.subject" />
+			<BR>
 			<html:errors property="message.subject" />
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<b><bean:message key="message.label.body" /></b>
+			<b><bean:message key="message.label.body" /><b class="required">*</b></b>
 		</td>
 		<td>
-			<b class="required">*</b>
 			<lams:STRUTS-textarea rows="10" cols="60" tabindex="2" property="message.body" />
 			<BR>
 			<html:errors property="message.body" />
@@ -35,24 +34,23 @@
 					<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>
+					<a href="<c:out value='${deleteURL}'/>" class="button" style="float: none"> <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>
-			<html:submit>
+		<td></td>
+		<td align="left" valign="bottom">
+					<BR>
+			<html:submit style="width:120px" styleClass="buttonStyle">
 				<bean:message key="button.submit" />
 			</html:submit>
-		</td>
-		<td>
-			<html:button property="cancel" onclick="javascript:window.parent.hideMessage()">
+			<html:button property="cancel" onclick="javascript:window.parent.hideMessage()" styleClass="buttonStyle" style="width:120px">
 				<bean:message key="button.cancel" />
 			</html:button>
 		</td>
Index: lams_tool_forum/web/jsps/message/topicform.jsp
===================================================================
diff -u -r71a37d456ee2d1d277774c125ac645ef7f06fa00 -r427a3b63491fb2f3206a785705ac247af49e1360
--- lams_tool_forum/web/jsps/message/topicform.jsp	(.../topicform.jsp)	(revision 71a37d456ee2d1d277774c125ac645ef7f06fa00)
+++ lams_tool_forum/web/jsps/message/topicform.jsp	(.../topicform.jsp)	(revision 427a3b63491fb2f3206a785705ac247af49e1360)
@@ -1,20 +1,19 @@
 <table width="100%" cellspacing="8" border="0" align="left">
 	<tr>
 		<td>
-			<b><bean:message key="message.label.subject" /></b>
+			<b><bean:message key="message.label.subject" /><b class="required">*</b></b>
 		</td>
 		<td align="left">
-			<b class="required">*</b>
 			<html:text size="30" tabindex="1" property="message.subject" />
+			<BR>
 			<html:errors property="message.subject" />
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<b><bean:message key="message.label.body" /></b>
+			<b><bean:message key="message.label.body" /><b class="required">*</b></b>
 		</td>
 		<td>
-			<b class="required">*</b>
 			<lams:STRUTS-textarea rows="10" cols="60" tabindex="2" property="message.body" />
 			<BR>
 			<html:errors property="message.body" />
@@ -25,18 +24,19 @@
 			<b><bean:message key="message.label.attachment" /></b>
 		</td>
 		<td>
-			&nbsp;&nbsp;
 			<html:file tabindex="3" property="attachmentFile" />
 			<html:errors property="message.attachment" />
 		</td>
 	</tr>
-	<td colspan="2" align="right" valign="bottom">
-		<html:submit style="width:120px" styleClass="buttonStyle">
-			<bean:message key="button.add" />
-		</html:submit>
-		<html:button property="cancel" onclick="javascript:window.parent.hideMessage()"  styleClass="buttonStyle" style="width:120px" >
-			<bean:message key="button.cancel" />
-		</html:button>
-	</td>
+	<tr>
+		<td></td>
+		<td align="left" valign="bottom">
+			<html:submit style="width:120px" styleClass="buttonStyle">
+				<bean:message key="button.add" />
+			</html:submit>
+			<html:button property="cancel" onclick="javascript:window.parent.hideMessage()" styleClass="buttonStyle" style="width:120px">
+				<bean:message key="button.cancel" />
+			</html:button>
+		</td>
 	</tr>
 </table>
Index: lams_tool_forum/web/jsps/message/topicview.jsp
===================================================================
diff -u -rbbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86 -r427a3b63491fb2f3206a785705ac247af49e1360
--- lams_tool_forum/web/jsps/message/topicview.jsp	(.../topicview.jsp)	(revision bbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86)
+++ lams_tool_forum/web/jsps/message/topicview.jsp	(.../topicview.jsp)	(revision 427a3b63491fb2f3206a785705ac247af49e1360)
@@ -41,17 +41,17 @@
 				<c:set var="edittopic">
 					<html:rewrite page="/authoring/editTopic.do?topicIndex=${topicIndex}&create=${topic.message.created.time}" />
 				</c:set> 
-				<html:link href="${edittopic}">
+				<html:link href="${edittopic}" styleClass="button">
 					<b><fmt:message key="label.edit" /></b>
-				</html:link>&nbsp;&nbsp;
+				</html:link>
 				
 				<c:set var="deletetopic">
 					<html:rewrite page="/authoring/deleteTopic.do?topicIndex=${topicIndex}" />
 				</c:set> 
-				<html:link href="${deletetopic}">
+				<html:link href="${deletetopic}" styleClass="button">
 					<b><fmt:message key="label.delete" />
-				</html:link> &nbsp;&nbsp;
-				<html:link href="javascript:window.parent.hideMessage()">
+				</html:link> 
+				<html:link href="javascript:window.parent.hideMessage()" styleClass="button">
 					<fmt:message key="button.cancel" />
 				</html:link></b>
 			</td>