Index: lams_tool_forum/conf/xdoclet/servlets.xml
===================================================================
diff -u -rfd1d19665518ba6781ce9e3851889c077e8efff4 -r8e35715613755a1ea9c9e22a374f431434dcaead
--- lams_tool_forum/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision fd1d19665518ba6781ce9e3851889c077e8efff4)
+++ lams_tool_forum/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 8e35715613755a1ea9c9e22a374f431434dcaead)
@@ -9,7 +9,7 @@
     <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
     <init-param>
       <param-name>config</param-name>
-      <param-value>/WEB-INF/struts/struts-config.xml</param-value>
+      <param-value>/WEB-INF/struts-config.xml</param-value>
     </init-param>
     <init-param>
       <param-name>debug</param-name>
Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -rfd1d19665518ba6781ce9e3851889c077e8efff4 -r8e35715613755a1ea9c9e22a374f431434dcaead
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision fd1d19665518ba6781ce9e3851889c077e8efff4)
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 8e35715613755a1ea9c9e22a374f431434dcaead)
@@ -74,10 +74,25 @@
 		<action path="/authoring/deleteTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			input="tiles:/authoring/forum/create" 
-			parameter="deleteTopic"
-			scope="request">
+			parameter="deleteTopic">
 		</action>
 		
+		<action path="/authoring/viewTopic"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			input="tiles:/authoring/forum/create" 
+			parameter="viewTopic">
+		</action>
+		
+		<action path="/authoring/finishTopic"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			input="tiles:/authoring/forum/create" 
+			name="forumForm" 
+			scope="session" 
+			validate="false"
+			parameter="finishTopic" >
+			<forward name="success" path="/jsps/authoring/authoring.jsp" />
+		</action>
+		
 		<!-- ========== END: Authroing Definitions ============================== -->
 		
 		<!-- Message related actions -->
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -rfd1d19665518ba6781ce9e3851889c077e8efff4 -r8e35715613755a1ea9c9e22a374f431434dcaead
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision fd1d19665518ba6781ce9e3851889c077e8efff4)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 8e35715613755a1ea9c9e22a374f431434dcaead)
@@ -63,7 +63,7 @@
             }
             forum.setAttachments(documents);
         }
-        forumDao.saveOrUpdate(forum);
+        forumDao.save(forum);
 
         //save topics of forum
         if (topics != null && topics.size() !=0) {
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -rfd1d19665518ba6781ce9e3851889c077e8efff4 -r8e35715613755a1ea9c9e22a374f431434dcaead
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision fd1d19665518ba6781ce9e3851889c077e8efff4)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8e35715613755a1ea9c9e22a374f431434dcaead)
@@ -24,6 +24,7 @@
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -79,6 +80,12 @@
         if (param.equals("deleteTopic")) {
        		return deleteTopic(mapping, form, request, response);
         }
+        if (param.equals("viewTopic")) {
+       		return viewTopic(mapping, form, request, response);
+        }
+        if (param.equals("finishTopic")) {
+       		return finishTopic(mapping, form, request, response);
+        }
         if (param.equals("updateContent")) {
        		return updateContent(mapping, form, request, response);
         }
@@ -111,7 +118,7 @@
 
 		
 		Long contentId = new Long(WebUtil.readLongParam(request,AttributeNames.TOOL_CONTENT_ID));
-		
+		ForumForm forumForm = (ForumForm)form;
 		//get back the topic list and display them on page
 		forumService = getForumManager();
 		
@@ -121,17 +128,16 @@
 			forum = forumService.getForumByContentId(contentId);
 			if(forum != null){
 				topics = forumService.getTopics(forum.getUid());
-				((ForumForm)form).setForum(forum);
+				forumForm.setForum(forum);
 			}
-			((ForumForm)form).setToolContentID(contentId);
+			forumForm.setToolContentID(contentId);
 		} catch (PersistenceException e) {
 			log.error(e);
 			return mapping.findForward("error");
 		}
 		
 		//set back STRUTS component value
-		request.setAttribute(ForumConstants.AUTHORING_TOPICS_LIST,topics);
-		request.setAttribute(ForumConstants.AUTHORING_DTO,forum);
+		request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, topics);
 		return mapping.findForward("success");
 	}
 
@@ -158,6 +164,7 @@
 			topics = new ArrayList();
 		}
 		topics.add(message);
+		
 		request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, topics);
 		return mapping.findForward("success");
 	}
@@ -175,7 +182,7 @@
 			}
 			request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS_LIST,topics);
     	}
-		
+
 		StringBuffer sb = new StringBuffer();
 		sb.append("<table width=\"100%\" cellspacing=\"8\" align=\"CENTER\" cellspacing=\"3\" cellpadding=\"3\" class=\"form\">");
 		sb.append("<tr>");
@@ -206,7 +213,23 @@
 		}
 		return null;
 	}
-
+    public ActionForward viewTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws PersistenceException {
+    	//TODO
+    	return null;
+    	
+    }
+    
+    public ActionForward finishTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws PersistenceException {
+    	List topics = (List) request.getSession().getAttribute(ForumConstants.AUTHORING_TOPICS_LIST);
+    	ForumForm forumForm = (ForumForm)form;
+    	//TODO: topic sequence not write
+    	forumForm.getForum().setMessages(new HashSet(topics));
+    	
+    	return mapping.findForward("success");
+    	
+    }
 	/**
 	 * Update all content for submit tool except online/offline instruction
 	 * files list.
@@ -226,16 +249,18 @@
 		Set attachment = forum.getAttachments();
 		try {
 			forumService = getForumManager();
-			Forum persistContent = forumService.getForum(forum.getContentId());
-			if(forum.getContentId().equals(persistContent.getContentId())){
+			Forum persistContent = forumService.getForumByContentId(forumForm.getToolContentID());
+			if(persistContent != null && forum.getContentId().equals(persistContent.getContentId())){
 				//keep Set type attribute for persist content becuase this update only 
 				//include updating simple properties from web page(i.e. text value, list value, etc)
 				
 				//copy web page value into persist content, as above, the "Set" type value kept.
 				PropertyUtils.copyProperties(persistContent,forum);
 				forumService.editForum(persistContent,attachment,topics);
-			}else
+			}else{
+				forum.setContentId(forumForm.getToolContentID());
 				forumService.createForum(forum,attachment,topics);
+			}
 		} catch (Exception e) {
 			log.error(e);
 		}
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -rfd1d19665518ba6781ce9e3851889c077e8efff4 -r8e35715613755a1ea9c9e22a374f431434dcaead
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision fd1d19665518ba6781ce9e3851889c077e8efff4)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 8e35715613755a1ea9c9e22a374f431434dcaead)
@@ -112,9 +112,22 @@
 		<action path="/authoring/deleteTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			input="tiles:/authoring/forum/create" 
-			parameter="deleteTopic"
-			scope="request">
+			parameter="deleteTopic">
 		</action>
+		<action path="/authoring/viewTopic"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			input="tiles:/authoring/forum/create" 
+			parameter="viewTopic">
+		</action>
+		<action path="/authoring/finishTopic"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			input="tiles:/authoring/forum/create" 
+			name="forumForm" 
+			scope="session" 
+			validate="false"
+			parameter="finishTopic" >
+			<forward name="success" path="/jsps/authoring/authoring.jsp" />
+		</action>
 		<!-- ========== END: Authroing Definitions ============================== -->
 		<!-- Message related actions -->
 		<action path="/learning/forum/open"
Index: lams_tool_forum/web/WEB-INF/web.xml
===================================================================
diff -u -r9401077810a09c0dc2a77ff8bce04b1efeb25353 -r8e35715613755a1ea9c9e22a374f431434dcaead
--- lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 9401077810a09c0dc2a77ff8bce04b1efeb25353)
+++ lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 8e35715613755a1ea9c9e22a374f431434dcaead)
@@ -59,46 +59,48 @@
     project's merge dir.
     -->
 
-     <!--
-	  - Loads the root application context of this web app at startup,
-	  - by default from "/WEB-INF/applicationContext.xml".
-		- Note that it is preferable to use ContextLoaderListener in a servlet container
-		- that follows the Servlet 2.4 initialization order (most Servlet 2.3 containers do).
-		-
-	  - Use WebApplicationContextUtils.getWebApplicationContext(servletContext)
-	  - to access it anywhere in the web application, outside of the framework.
-	  -
-	  - The root context is the parent of all servlet-specific contexts.
-	  - This means that its beans are automatically available in these child contexts,
-	  - both for getBean(name) calls and (external) bean references.
-	-->
-	<servlet>
-		<servlet-name>context</servlet-name>
-		<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
+ <servlet>
+	<servlet-name>context</servlet-name>
+	<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
+	<load-on-startup>1</load-on-startup>
+</servlet>
+
+<servlet>
+    <servlet-name>action</servlet-name>
+    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
+    <init-param>
+      <param-name>config</param-name>
+      <param-value>/WEB-INF/struts-config.xml</param-value>
+    </init-param>
+    <init-param>
+      <param-name>debug</param-name>
+      <param-value>999</param-value>
+    </init-param>
+    <init-param>
+      <param-name>detail</param-name>
+      <param-value>2</param-value>
+    </init-param>
+    <init-param>
+      <param-name>validate</param-name>
+      <param-value>true</param-value>
+    </init-param>
+    <load-on-startup>2</load-on-startup>
+</servlet>
+
+<servlet>
+		<servlet-name>Connector</servlet-name>
+		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+		<init-param>
+			<param-name>baseDir</param-name>
+			<param-value>/UserFiles/</param-value>
+		</init-param>
+		<init-param>
+			<param-name>debug</param-name>
+			<param-value>false</param-value>
+		</init-param>
 		<load-on-startup>1</load-on-startup>
-	</servlet>
+</servlet>
 
-	<servlet>
-	    <servlet-name>action</servlet-name>
-	    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
-	    <init-param>
-	      <param-name>config</param-name>
-	      <param-value>/WEB-INF/struts-config.xml</param-value>
-	    </init-param>
-	    <init-param>
-	      <param-name>debug</param-name>
-	      <param-value>999</param-value>
-	    </init-param>
-	    <init-param>
-	      <param-name>detail</param-name>
-	      <param-value>2</param-value>
-	    </init-param>
-	    <init-param>
-	      <param-name>validate</param-name>
-	      <param-value>true</param-value>
-	    </init-param>
-	    <load-on-startup>2</load-on-startup>
-    </servlet>
 	<!--  The download servlet, reused from the content repository jar -->
 	<servlet>
 		<description>Instructions Download</description>
@@ -108,15 +110,21 @@
 	    <load-on-startup>3</load-on-startup>
 	</servlet>
 
-  	<servlet-mapping>
-		<servlet-name>action</servlet-name>
-	    <url-pattern>*.do</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>download</servlet-name>
-		<url-pattern>/download/*</url-pattern>
-  	</servlet-mapping>
+  <servlet-mapping>
+	<servlet-name>action</servlet-name>
+    <url-pattern>*.do</url-pattern>
+</servlet-mapping>
 
+<servlet-mapping>
+    <servlet-name>Connector</servlet-name>
+    <url-pattern>/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
+</servlet-mapping>
+
+<servlet-mapping>
+	<servlet-name>download</servlet-name>
+	<url-pattern>/download/*</url-pattern>
+</servlet-mapping>
+
    <session-config>
       <session-timeout>120</session-timeout>
    </session-config>
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
diff -u -rdd63636214e3a807dc010aa392ba85e62fb7dee1 -r8e35715613755a1ea9c9e22a374f431434dcaead
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision dd63636214e3a807dc010aa392ba85e62fb7dee1)
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision 8e35715613755a1ea9c9e22a374f431434dcaead)
@@ -1,5 +1,13 @@
 <%@ include file="/includes/taglibs.jsp" %>
+<script type="text/javascript">
+<!--
 
+function closeWin(){
+	window.opener.parent.location.href = "<html:rewrite page='/authoring/finishTopic.do'/>";
+	window.close();
+}
+//-->
+</script>
 <html:errors property="error" />
 <div align="center">
 <html:form action="/authoring/createTopic.do" focus="message.subject"
Index: lams_tool_forum/web/jsps/message/form.jsp
===================================================================
diff -u -rdd63636214e3a807dc010aa392ba85e62fb7dee1 -r8e35715613755a1ea9c9e22a374f431434dcaead
--- lams_tool_forum/web/jsps/message/form.jsp	(.../form.jsp)	(revision dd63636214e3a807dc010aa392ba85e62fb7dee1)
+++ lams_tool_forum/web/jsps/message/form.jsp	(.../form.jsp)	(revision 8e35715613755a1ea9c9e22a374f431434dcaead)
@@ -14,12 +14,21 @@
 	</tr>
 	<tr>
 		<td valign="MIDDLE"><b><bean:message key="message.label.attachment" /></b></td>
-		<td valign="MIDDLE">&nbsp;&nbsp;<html:file tabindex="3"
-			property="attachmentName" /> <html:errors
-			property="message.attachment" /></td>
+		<td valign="MIDDLE">
+			&nbsp;&nbsp;<html:file tabindex="3"
+				property="attachmentName" /> <html:errors
+				property="message.attachment" />
+		</td>
 	</tr>
-	<td>&nbsp;&nbsp;<html:submit>
-		<bean:message key="button.submit" />
-	</html:submit></td>
+		<td>&nbsp;&nbsp;
+			<html:submit>
+				<bean:message key="button.submit" />
+			</html:submit>
+		</td>
+		<td>
+			<html:button property="done" onclick="closeWin()">
+				<bean:message key="button.done" />
+			</html:button>
+		</td>
 	</tr>
 </table>