Index: lams_tool_forum/.classpath
===================================================================
diff -u -rb1ef965ad3a0cd4ea7bb807bd313d1f0cf68d1e7 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/.classpath	(.../.classpath)	(revision b1ef965ad3a0cd4ea7bb807bd313d1f0cf68d1e7)
+++ lams_tool_forum/.classpath	(.../.classpath)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/java"/>
+	<classpathentry output="JBOSS4-Forum" kind="src" path="src/java"/>
 	<classpathentry kind="src" path="test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
Index: lams_tool_forum/.project
===================================================================
diff -u -rafa9a1cbc332a29b3f6c18d885c4c119cc233d25 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/.project	(.../.project)	(revision afa9a1cbc332a29b3f6c18d885c4c119cc233d25)
+++ lams_tool_forum/.project	(.../.project)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -40,4 +40,11 @@
 		<nature>com.genuitec.eclipse.j2eedt.core.webnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<linkedResources>
+		<link>
+			<name>JBOSS4-Forum</name>
+			<type>2</type>
+			<location>D:/jboss-4.0.2/server/default/deploy/lams.ear/lams-tool-lafrum11.war/WEB-INF/classes</location>
+		</link>
+	</linkedResources>
 </projectDescription>
Index: lams_tool_forum/build.xml
===================================================================
diff -u -rc109ffd9f84d13dabeeb31bafe8484c0f3a26b40 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/build.xml	(.../build.xml)	(revision c109ffd9f84d13dabeeb31bafe8484c0f3a26b40)
+++ lams_tool_forum/build.xml	(.../build.xml)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -285,7 +285,7 @@
 	<!-- =================================================================== -->
 	<!-- Generate the deploy package                                         -->
 	<!-- =================================================================== -->
-	<target name="create-deploy-package" depends="build-war" 
+	<target name="create-deploy-package" depends="build-war,jar" 
 		description="Generate the deployment package.">
 
 		<echo>+------------------------------------------+</echo>
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml
===================================================================
diff -u -rc109ffd9f84d13dabeeb31bafe8484c0f3a26b40 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision c109ffd9f84d13dabeeb31bafe8484c0f3a26b40)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -147,6 +147,7 @@
             update="true"
             insert="true"
             column="content_id"
+            unique="true"
         />
 
         <!--
@@ -160,5 +161,8 @@
         <query name="allForums"><![CDATA[
             from Forum forum
         ]]></query>
+        <query name="forumByContentId"><![CDATA[
+            from Forum forum where forum.contentId=?
+        ]]></query>
 
 </hibernate-mapping>
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml
===================================================================
diff -u -rc109ffd9f84d13dabeeb31bafe8484c0f3a26b40 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision c109ffd9f84d13dabeeb31bafe8484c0f3a26b40)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -160,11 +160,5 @@
         <query name="allMessages"><![CDATA[
             from Message message
         ]]></query>
-        <query name="allAuthoredMessagesOfForum"><![CDATA[
-            from Message message where message.forum.id = ? AND message.isAuthored = true
-        ]]></query>
-        <query name="allMessagesByForum"><![CDATA[
-            from Message message where message.forum = ?
-        ]]></query>
 
 </hibernate-mapping>
Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -ree36bb343b77214b9bffd9a8e47dd9e8caa25813 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision ee36bb343b77214b9bffd9a8e47dd9e8caa25813)
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -1,225 +1,131 @@
-	 <!-- ========== Action Mapping Definitions ============================== -->
+		<!-- ========== Action Mapping Definitions ============================== -->
+		
+		<!-- ========== BEGIN: Authroing Definitions ============================== -->
+		<action path="/authoring/init"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			parameter="initPage" >
+			<forward name="success" path="/jsps/authoring/authoring.jsp" />
+		</action>
 
-    <action path="/index"
-		type="org.apache.struts.actions.ForwardAction" parameter="tiles:/layout" />
+		<action path="/authoring/update"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			name="forumForm" 
+			scope="request" 
+			parameter="updateContent" 
+			validate="false">
+			<forward name="success" path="/jsps/authoring/authoring.jsp" />
+		</action>
 
-	<action path="/error"
-		type="org.apache.struts.actions.ForwardAction"
-		parameter="tiles:/error" />
-
-	<action path="/blank"
-		type="org.apache.struts.actions.ForwardAction"
-		parameter="tiles:/blank" />
-
-      	<!-- Forum  related actions -->
-    <action
-      path="/authoring"
-      type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-      name="forumForm"
-      scope="request"
-      input="/authoring/authoring.jsp"
-      parameter="action"
-      unknown="false"
-      validate="true"
-	>
-      <forward
-        name="success"
-        path="/authoring/success.jsp"
-        redirect="false"
-      />
-    </action>
-    
-	    <action path="/authoring/forum/create"
-		    type="org.apache.struts.actions.ForwardAction" parameter="tiles:/authoring/forum/create" />
-
-	    <action path="/authoring/forum/edit"
-		    type="org.apache.struts.actions.ForwardAction" parameter="tiles:/authoring/forum/edit" />
-
-        <action    path="/authoring/forum/instructions"
-        	type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			name="forumForm"
-			validate="true"
-            input="/authoring/forum/create.do?selected=2"
-			parameter="instructions"
-			scope="session">
-            <forward name="success"		path="/authoring/forum/create.do?selected=2"/>
-        </action>
-
-
-        <action    path="/authoring/forum/editInstructions"
-            type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-            name="forumForm"
-            validate="true"
-            input="/authoring/forum/edit.do?selected=2"
-            parameter="instructions"
-            scope="session">
-            <forward name="success"		path="/authoring/forum/edit.do?selected=2"/>
-        </action>
-
-        <action    path="/authoring/forum/advanced"
-        	type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			name="forumForm"
-			validate="true"
-            input="/authoring/forum/create.do?selected=1"
-			parameter="advanced"
-			scope="session">
-            <forward name="success"		path="/authoring/forum/create.do?selected=1"/>
-        </action>
-
-        <action    path="/authoring/forum/editAdvanced"
-        	type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			name="forumForm"
-			validate="true"
-            input="/authoring/forum/edit.do?selected=1"
-			parameter="advanced"
-			scope="session">
-            <forward name="success"		path="/authoring/forum/edit.do?selected=1"/>
-        </action>
-
-        <action    path="/authoring/forum/createForum"
+		<action path="/authoring/uploadOnline"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			name="forumForm" 
+			scope="request" 
+			parameter="uploadOnline" 
+			validate="false">
+			<forward name="success" path="/jsps/authoring/authoring.jsp" />
+		</action>
+		
+		<action path="/authoring/uploadOffline"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			name="forumForm" 
+			scope="request" 
+			parameter="uploadOffline" 
+			validate="false">
+			<forward name="success" path="/jsps/authoring/authoring.jsp" />
+		</action>
+		
+		<action path="/authoring/deleteOnline"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			parameter="deleteOnline" >
+			<forward name="success" path="/jsps/authoring/authoring.jsp" />
+		</action>
+		
+		<action path="/authoring/deleteOffline"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			parameter="deleteOffline" >
+			<forward name="success" path="/jsps/authoring/authoring.jsp" />
+		</action>
+						
+		<action path="/authoring/newTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			name="forumForm"
-			validate="true"
-            input="tiles:/authoring/forum/create"
-			parameter="createForum"
-			scope="session">
-            <forward name="success"		path="tiles:/authoring/forum/edit"/>
-        </action>
-
-        <action    path="/authoring/forum/getForum"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			parameter="getForum"
-			scope="session">
-            <forward name="success"		path="tiles:/authoring/forum/edit"/>
-        </action>
-
-		<action    path="/authoring/forum/editForum"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			name="forumForm"
-			validate="true"
-            input="/authoring/forum/edit.do"
-			parameter="editForum"
-			scope="session">
-			<forward name="success"		path="/authoring/forum/edit.do"/>
+			parameter="newTopic">
+			<forward name="success" path="tiles:/authoring/forum/newTopic" />
 		</action>
-
-        <action    path="/authoring/forum/deleteAttachment"
+		
+		<action path="/authoring/createTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			name="forumForm"
+			name="messageForm" 
 			validate="true"
-			parameter="deleteAttachment"
-			scope="session">
-            <forward name="success"		path="/authoring/forum/create.do?selected=2"/>
-        </action>
-
-        <action    path="/authoring/forum/edit/deleteAttachment"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			name="forumForm"
-			validate="true"
-			parameter="deleteAttachment"
-			scope="session">
-            <forward name="success"		path="/authoring/forum/edit.do?selected=2"/>
-        </action>
-
-	    <action path="/authoring/forum/newTopic"
-		    type="org.apache.struts.actions.ForwardAction" parameter="tiles:/authoring/forum/newTopic" />
-
-		<action    path="/authoring/forum/createTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			name="messageForm"
-			validate="true"
-            input="tiles:/authoring/forum/newTopic"
+			input="tiles:/authoring/forum/newTopic" 
 			parameter="createTopic"
 			scope="request">
-            <forward name="success"		path="tiles:/authoring/forum/create"/>
+			<forward name="success" path="/authoring/forum/newTopic" />
 		</action>
-
-        <action    path="/authoring/forum/deleteTopic"
+		
+		<action path="/authoring/deleteTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-            input="tiles:/authoring/forum/create"
+			input="tiles:/authoring/forum/create" 
 			parameter="deleteTopic"
-            scope="request">
-            <forward name="success"		path="tiles:/authoring/forum/create"/>
-        </action>
-
-        <action    path="/authoring/forum/edit/deleteTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-            input="tiles:/authoring/forum/create"
-			parameter="deleteTopic"
-            scope="request">
-            <forward name="success"		path="tiles:/authoring/forum/edit"/>
-        </action>
-
-        <action    path="/authoring/forum/getForum"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			validate="true"
-			parameter="getForum"
 			scope="request">
-			<forward name="success"		path="tiles:/authoring/forum/edit"/>
 		</action>
-
-		<action    path="/authoring/forum/delete"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			parameter="deleteForum"
-			scope="request">
-			<forward name="success"		path="titles:/authoring/forum/success"/>
-		</action>
-
+		
+		<!-- ========== END: Authroing Definitions ============================== -->
+		
 		<!-- Message related actions -->
-
-    	<action    path="/learning/forum/open"
+		
+		<action path="/learning/forum/open"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			parameter="openForum"
-			scope="request">
-			<forward name="success"		path="tiles:/learning/forum/open"/>
+			parameter="openForum" scope="request">
+			<forward name="success" path="tiles:/learning/forum/open" />
 		</action>
-
-    	<action    path="/learning/message/openTopic"
+		
+		<action path="/learning/message/openTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			parameter="openTopic"
-			scope="request">
-			<forward name="success"		path="tiles:/learning/message/open"/>
+			parameter="openTopic" scope="request">
+			<forward name="success" path="tiles:/learning/message/open" />
 		</action>
-
-    	<action    path="/learning/message/getMessage"
+		
+		<action path="/learning/message/getMessage"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			parameter="getMessage"
-			scope="request">
-			<forward name="success"		path="tiles:/learning/message/getMessage"/>
+			parameter="getMessage" scope="request">
+			<forward name="success" path="tiles:/learning/message/getMessage" />
 		</action>
-
-    	<action    path="/learning/message/post"
-		     type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			parameter="post"
-			scope="request">
-			<forward name="success"		path="tiles:/learning/message/post"/>
+		
+		<action path="/learning/message/post"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			parameter="post" scope="request">
+			<forward name="success" path="tiles:/learning/message/post" />
 		</action>
-
-		<action    path="/learning/message/reply"
+		
+		<action path="/learning/message/reply"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			name="messageForm"
-			validate="true"
-			input="tiles:/learning/message/post"
-			parameter="reply"
-			scope="request">
-			<forward name="success"		path="/learning/message/openTopic.do"/>
+			name="messageForm" validate="true" input="tiles:/learning/message/post"
+			parameter="reply" scope="request">
+			<forward name="success" path="/learning/message/openTopic.do" />
 		</action>
-
-		<action    path="/learning/message/editMessage"
+		
+		<action path="/learning/message/editMessage"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			name="messageForm"
-			validate="true"
-			input="tiles:/learning/message/getMessage"
-			parameter="editMessage"
+			name="messageForm" validate="true"
+			input="tiles:/learning/message/getMessage" parameter="editMessage"
 			scope="request">
-			<forward name="success"		path="/learning/message/openTopic.do"/>
+			<forward name="success" path="/learning/message/openTopic.do" />
 		</action>
-
-		<action    path="/learning/message/delete"
+		
+		<action path="/learning/message/delete"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			parameter="deleteMessage"
-			scope="request">
-			<forward name="success"		path="/learing/message/open.do"/>
+			parameter="deleteMessage" scope="request">
+			<forward name="success" path="/learing/message/open.do" />
 		</action>
-
-
+		
+				
+		<!-- System level actions -->
+		<action path="/index" type="org.apache.struts.actions.ForwardAction"
+			parameter="tiles:/layout" />
+		
+		<action path="/error" type="org.apache.struts.actions.ForwardAction"
+			parameter="tiles:/error" />
+		
+		<action path="/blank" type="org.apache.struts.actions.ForwardAction"
+			parameter="tiles:/blank" />
+				
Index: lams_tool_forum/db/sql/create_lams_tool_forum.sql
===================================================================
diff -u -rd21a020d917869e77f133713f28b8e6c70ad08d5 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision d21a020d917869e77f133713f28b8e6c70ad08d5)
+++ lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -1,39 +1,67 @@
+SET FOREIGN_KEY_CHECKS=0;
 create table tl_lafrum11_attachment (
-   UUID bigint not null auto_increment,
-   VERSION bigint,
+   uid bigint not null auto_increment,
+   version_id bigint,
    type varchar(255),
-   NAME varchar(255),
-   forum bigint,
-   primary key (UUID)
+   file_name varchar(255),
+   uuid bigint,
+   forum_uid bigint,
+   message_uid bigint,
+   primary key (uid)
 );
 create table tl_lafrum11_forum (
-   UUID bigint not null auto_increment,
-   CREATED datetime,
-   UPDATED datetime,
-   CREATEDBY bigint,
-   TITLE varchar(255),
-   ALLOWANNOMITY bit,
-   FORCEOFFLINE bit,
-   LOCKWHENFINISHED bit,
-   INSTRUCTIONS varchar(255),
-   ONLINEINSTRUCTIONS varchar(255),
-   OFFLINEINSTRUCTIONS varchar(255),
-   primary key (UUID)
+   uid bigint not null auto_increment,
+   create_date datetime,
+   update_date datetime,
+   create_by bigint,
+   title varchar(255),
+   allow_anonym bit,
+   run_offline bit,
+   lock_on_finished bit,
+   instructions varchar(255),
+   online_instructions varchar(255),
+   offline_instructions varchar(255),
+   content_in_use bit,
+   define_later bit,
+   content_id bigint,
+   primary key (uid)
 );
+create table tl_lafrum11_forum_user (
+   uid bigint not null auto_increment,
+   user_id bigint,
+   status bit,
+   full_name varchar(255),
+   user_name varchar(255),
+   primary key (uid)
+);
 create table tl_lafrum11_message (
-   UUID bigint not null auto_increment,
-   CREATED datetime,
-   UPDATED datetime,
-   CREATEDBY bigint,
-   MODIFIEDBY bigint,
-   SUBJECT varchar(255),
-   BODY text,
-   ISAUTHORED bit,
-   ISANNONYMOUS bit,
-   FORUM bigint,
-   parent bigint,
-   primary key (UUID)
+   uid bigint not null auto_increment,
+   create_date datetime,
+   update_date datetime,
+   create_by bigint,
+   modified_by bigint,
+   subject varchar(255),
+   body text,
+   is_authored bit,
+   is_anonymous bit,
+   forum_session_uid bigint,
+   user_uid bigint,
+   parent_uid bigint,
+   primary key (uid)
 );
-alter table tl_lafrum11_attachment add index FK389AD9A29EAD680D (forum), add constraint FK389AD9A29EAD680D foreign key (forum) references tl_lafrum11_forum (UUID);
-alter table tl_lafrum11_message add index FK4A6067E8F7440FBC (parent), add constraint FK4A6067E8F7440FBC foreign key (parent) references tl_lafrum11_message (UUID);
-alter table tl_lafrum11_message add index FK4A6067E89EAD680D (FORUM), add constraint FK4A6067E89EAD680D foreign key (FORUM) references tl_lafrum11_forum (UUID);
+create table tl_lafrum11_tool_session (
+   uid bigint not null auto_increment,
+   session_end_date datetime,
+   session_start_date datetime,
+   status integer,
+   forum_uid bigint,
+   session_id bigint,
+   primary key (uid)
+);
+alter table tl_lafrum11_attachment add index FK389AD9A2FE939F2A (message_uid), add constraint FK389AD9A2FE939F2A foreign key (message_uid) references tl_lafrum11_message (uid);
+alter table tl_lafrum11_attachment add index FK389AD9A2131CE31E (forum_uid), add constraint FK389AD9A2131CE31E foreign key (forum_uid) references tl_lafrum11_forum (uid);
+alter table tl_lafrum11_message add index FK4A6067E824089E4D (parent_uid), add constraint FK4A6067E824089E4D foreign key (parent_uid) references tl_lafrum11_message (uid);
+alter table tl_lafrum11_message add index FK4A6067E8C6FF3C72 (forum_session_uid), add constraint FK4A6067E8C6FF3C72 foreign key (forum_session_uid) references tl_lafrum11_tool_session (uid);
+alter table tl_lafrum11_message add index FK4A6067E8B0A7E6B3 (user_uid), add constraint FK4A6067E8B0A7E6B3 foreign key (user_uid) references tl_lafrum11_forum_user (uid);
+alter table tl_lafrum11_tool_session add index FK5A04D7AE131CE31E (forum_uid), add constraint FK5A04D7AE131CE31E foreign key (forum_uid) references tl_lafrum11_forum (uid);
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_forum/db/sql/drop_lams_tool_forum.sql
===================================================================
diff -u -rd21a020d917869e77f133713f28b8e6c70ad08d5 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/db/sql/drop_lams_tool_forum.sql	(.../drop_lams_tool_forum.sql)	(revision d21a020d917869e77f133713f28b8e6c70ad08d5)
+++ lams_tool_forum/db/sql/drop_lams_tool_forum.sql	(.../drop_lams_tool_forum.sql)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -1,7 +1,9 @@
 SET FOREIGN_KEY_CHECKS=0;
 drop table if exists tl_lafrum11_attachment;
 drop table if exists tl_lafrum11_forum;
+drop table if exists tl_lafrum11_forum_user;
 drop table if exists tl_lafrum11_message;
+drop table if exists tl_lafrum11_tool_session;
 SET FOREIGN_KEY_CHECKS=1;
 
 
Index: lams_tool_forum/db/sql/table-schema.sql
===================================================================
diff -u -rc109ffd9f84d13dabeeb31bafe8484c0f3a26b40 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/db/sql/table-schema.sql	(.../table-schema.sql)	(revision c109ffd9f84d13dabeeb31bafe8484c0f3a26b40)
+++ lams_tool_forum/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -33,7 +33,7 @@
    offline_instructions varchar(255),
    content_in_use bit,
    define_later bit,
-   content_id bigint,
+   content_id bigint unique,
    primary key (uid)
 );
 create table tl_lafrum11_forum_user (
Index: lams_tool_forum/src/java/forumApplicationContext.xml
===================================================================
diff -u -ree36bb343b77214b9bffd9a8e47dd9e8caa25813 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/src/java/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision ee36bb343b77214b9bffd9a8e47dd9e8caa25813)
+++ lams_tool_forum/src/java/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -13,6 +13,8 @@
                <value>org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml</value>
                <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>
             </list>
         </property>
     </bean>
@@ -42,7 +44,7 @@
     <bean id="permissionManager" class="org.lamsfoundation.lams.tool.forum.permissions.PermissionManagerImpl">
     </bean>
 
-    <bean id="forumManagerTarget" class="org.lamsfoundation.lams.tool.forum.service.ForumManagerImpl">
+    <bean id="forumManagerTarget" class="org.lamsfoundation.lams.tool.forum.service.ForumService">
         <property name="forumDao">
             <ref local="forumDao"/>
         </property>
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/core/PersistenceException.java
===================================================================
diff -u -rfc0b50d6cdbbad54f921d29b0c6afff0388d2eec -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/core/PersistenceException.java	(.../PersistenceException.java)	(revision fc0b50d6cdbbad54f921d29b0c6afff0388d2eec)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/core/PersistenceException.java	(.../PersistenceException.java)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -1,15 +1,15 @@
 package org.lamsfoundation.lams.tool.forum.core;
 
 /**
- * Created by IntelliJ IDEA.
  * User: conradb
  * Date: 6/06/2005
  * Time: 10:51:43
- * To change this template use File | Settings | File Templates.
  */
-public class PersistenceException extends Exception {
+public class PersistenceException extends RuntimeException {
 
-    public PersistenceException(String message) {
+	private static final long serialVersionUID = 3903937111808861090L;
+
+	public PersistenceException(String message) {
         super(message);
     }
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml
===================================================================
diff -u -rc109ffd9f84d13dabeeb31bafe8484c0f3a26b40 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision c109ffd9f84d13dabeeb31bafe8484c0f3a26b40)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -147,6 +147,7 @@
             update="true"
             insert="true"
             column="content_id"
+            unique="true"
         />
 
         <!--
@@ -160,5 +161,8 @@
         <query name="allForums"><![CDATA[
             from Forum forum
         ]]></query>
+        <query name="forumByContentId"><![CDATA[
+            from Forum forum where forum.contentId=?
+        ]]></query>
 
 </hibernate-mapping>
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java
===================================================================
diff -u -rc109ffd9f84d13dabeeb31bafe8484c0f3a26b40 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	(.../Forum.java)	(revision c109ffd9f84d13dabeeb31bafe8484c0f3a26b40)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	(.../Forum.java)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -1,6 +1,7 @@
 package org.lamsfoundation.lams.tool.forum.persistence;
 
 import java.util.Date;
+import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
@@ -13,6 +14,7 @@
  * @hibernate.class  table="tl_lafrum11_forum"
  *
  * @hibernate.query name="allForums" query="from Forum forum"
+ * @hibernate.query name="forumByContentId" query="from Forum forum where forum.contentId=?"
  */
 public class Forum {
 	private Long uid;
@@ -28,10 +30,13 @@
 	private boolean defineLater;
 	private boolean contentInUse;
 	private Set attachments;
-	protected Date created;
-	protected Date updated;
-  	protected Long createdBy;
+	private Date created;
+	private Date updated;
+	private Long createdBy;
     
+  	public Forum(){
+  		attachments = new HashSet();
+  	}
 	/**
 	 * Returns the object's creation date
 	 *
@@ -303,7 +308,7 @@
 		this.defineLater = defineLater;
 	}
 	/**
-	 * @hibernate.property column="content_id" 
+	 * @hibernate.property column="content_id" unique="true" 
 	 * @return
 	 */
 	public Long getContentId() {
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumDao.java
===================================================================
diff -u -r69b42721943dd9b418ac624d16b7f239dc12ed99 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumDao.java	(.../ForumDao.java)	(revision 69b42721943dd9b418ac624d16b7f239dc12ed99)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumDao.java	(.../ForumDao.java)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import org.hibernate.FlushMode;
+import org.springframework.orm.hibernate3.HibernateTemplate;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 /**
@@ -11,7 +13,9 @@
  *
  */
 public class ForumDao extends HibernateDaoSupport {
-
+	private static final String FIND_INSTRUCTION_FILE = "from " + Attachment.class.getName() 
+			+ " as i where content_id=? and i.uuID=? and i.versionID=? and i.type=?";
+	
 	public void saveOrUpdate(Forum forum) {
 		forum.updateModificationData();
 		this.getHibernateTemplate().saveOrUpdate(forum);
@@ -36,4 +40,30 @@
 		return this.getHibernateTemplate().findByNamedQuery(name);
 	}
 
+	public Forum getByContentId(Long contentID) {
+		List list = getHibernateTemplate().findByNamedQuery("forumByContentId",contentID);
+		if(list != null && list.size() > 0)
+			return (Forum) list.get(0);
+		else
+			return null;
+	}
+
+	public void deleteInstrcutionFile(Long contentID, Long uuid, Long versionID, String type) {
+		HibernateTemplate templ = this.getHibernateTemplate();
+		if ( contentID != null && uuid != null && versionID != null ) {
+			List list = getSession().createQuery(FIND_INSTRUCTION_FILE)
+				.setLong(0,contentID.longValue())
+				.setLong(1,uuid.longValue())
+				.setLong(2,versionID.longValue())
+				.setString(3,type)
+				.list();
+			if(list != null && list.size() > 0){
+				Attachment file = (Attachment) list.get(0);
+				this.getSession().setFlushMode(FlushMode.AUTO);
+				templ.delete(file);
+				templ.flush();
+			}
+		}
+	}
+
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml
===================================================================
diff -u -rc109ffd9f84d13dabeeb31bafe8484c0f3a26b40 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision c109ffd9f84d13dabeeb31bafe8484c0f3a26b40)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	(.../Message.hbm.xml)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -160,11 +160,5 @@
         <query name="allMessages"><![CDATA[
             from Message message
         ]]></query>
-        <query name="allAuthoredMessagesOfForum"><![CDATA[
-            from Message message where message.forum.id = ? AND message.isAuthored = true
-        ]]></query>
-        <query name="allMessagesByForum"><![CDATA[
-            from Message message where message.forum = ?
-        ]]></query>
 
 </hibernate-mapping>
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java
===================================================================
diff -u -rc109ffd9f84d13dabeeb31bafe8484c0f3a26b40 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	(.../Message.java)	(revision c109ffd9f84d13dabeeb31bafe8484c0f3a26b40)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	(.../Message.java)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -12,25 +12,24 @@
  * @hibernate.class table="tl_lafrum11_message"
  *
  * @hibernate.query name="allMessages" query="from Message message"
- * @hibernate.query name="allAuthoredMessagesOfForum" query="from Message message where message.forum.id = ? AND message.isAuthored = true"
- * @hibernate.query name="allMessagesByForum" query="from Message message where message.forum = ?"
  */
 public class Message {
 	private Long uid;
 	private String subject;
 	private String body;
 	private boolean isAuthored;
 	private boolean isAnonymous;
-	private Message parent;
-	private Set replies;
+
 	private ToolSession toolSession;
+	private Message parent;
 	private ForumUser learner;
+	private Set replies;
+	private Set attachments;
 	
-	protected Date created;
-	protected Date updated;
-  	protected Long createdBy;
-    protected Long modifiedBy;
-  	private Set attachments;
+	private Date created;
+	private Date updated;
+	private Long createdBy;
+	private Long modifiedBy;
 
 	/**
 	 * Returns the object's creation date
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -rc109ffd9f84d13dabeeb31bafe8484c0f3a26b40 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision c109ffd9f84d13dabeeb31bafe8484c0f3a26b40)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -1,12 +1,28 @@
 package org.lamsfoundation.lams.tool.forum.service;
 
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.struts.upload.FormFile;
+import org.lamsfoundation.lams.contentrepository.AccessDeniedException;
+import org.lamsfoundation.lams.contentrepository.ICredentials;
+import org.lamsfoundation.lams.contentrepository.ITicket;
+import org.lamsfoundation.lams.contentrepository.InvalidParameterException;
+import org.lamsfoundation.lams.contentrepository.LoginException;
+import org.lamsfoundation.lams.contentrepository.NodeKey;
+import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
+import org.lamsfoundation.lams.contentrepository.WorkspaceNotFoundException;
+import org.lamsfoundation.lams.contentrepository.service.IRepositoryService;
+import org.lamsfoundation.lams.contentrepository.service.RepositoryProxy;
+import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials;
 import org.lamsfoundation.lams.tool.ToolContentManager;
 import org.lamsfoundation.lams.tool.ToolSessionExportOutputData;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
@@ -18,21 +34,26 @@
 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.Message;
 import org.lamsfoundation.lams.tool.forum.persistence.MessageDao;
+import org.lamsfoundation.lams.tool.forum.util.ForumConstants;
+import org.lamsfoundation.lams.tool.forum.util.ForumToolContentHandler;
 import org.lamsfoundation.lams.usermanagement.User;
 
+
 /**
- * Created by IntelliJ IDEA.
- * User: conradb
- * Date: 8/06/2005
- * Time: 15:13:54
- * To change this template use File | Settings | File Templates.
+ * 
+ * @author Steve.Ni
+ * 
+ * @version $Revision$
  */
 public class ForumService implements IForumService,ToolContentManager,ToolSessionManager {
 	private ForumDao forumDao;
 	private AttachmentDao attachmentDao;
 	private MessageDao messageDao;
+	private ForumToolContentHandler toolContentHandler;
+	private IRepositoryService repositoryService;
 	
     public Forum createForum(Forum forum, Map attachments, Map topics) throws PersistenceException {
         if (attachments != null && attachments.size() !=0) {
@@ -101,6 +122,9 @@
         return (Forum) forumDao.getById(forumId);
     }
 
+	public Forum getForumByContentId(Long contentID)  throws PersistenceException {
+		return (Forum) forumDao.getByContentId(contentID);
+	}
     public void deleteForum(Long forumId) throws PersistenceException {
         Forum forum = this.getForum(forumId);
         forumDao.delete(forum);
@@ -211,4 +235,134 @@
 
 	public void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException {
 	}
+
+	public Attachment uploadInstructionFile(Long contentId, FormFile uploadFile, String fileType) {
+		Attachment refile = null;
+		if(uploadFile == null || StringUtils.isEmpty(uploadFile.getFileName()))
+			throw new ForumException("Could not find upload file: " + uploadFile);
+		
+        Forum content = getForum(contentId);
+        if ( content == null || !contentId.equals(content.getContentId())) {
+        	content  = new Forum();
+        	content.setContentId(contentId);
+        	//user firstly upload file without any other input, even the not-null 
+        	//field "title". Set title as default title.
+        	content.setTitle(ForumConstants.DEFAULT_TITLE);
+        }
+		NodeKey nodeKey = processFile(uploadFile,fileType);
+		
+		Set fileSet = content.getAttachments();
+		if(fileSet == null){
+			fileSet = new HashSet();
+			content.setAttachments(fileSet);
+		}
+		Attachment file = new Attachment();
+		file.setType(fileType);
+		file.setUid(nodeKey.getUuid());
+		file.setVersionId(nodeKey.getVersion());
+		file.setFileName(uploadFile.getFileName());
+		fileSet.add(file);
+		forumDao.saveOrUpdate(content);
+		
+		refile = new Attachment();
+		try {
+			PropertyUtils.copyProperties(refile,file);
+		} catch (Exception e) {
+			throw new ForumException("Could not get return InstructionFile instance" +e.getMessage());
+		}
+		return refile;
+
+	}
+    /**
+     * Process an uploaded file.
+     * 
+     * @param forumForm
+     * @throws FileNotFoundException
+     * @throws IOException
+     * @throws RepositoryCheckedException
+     * @throws InvalidParameterException
+     */
+    private NodeKey processFile(FormFile file, String fileType){
+    	NodeKey node = null;
+        if (file!= null && !StringUtils.isEmpty(file.getFileName())) {
+            String fileName = file.getFileName();
+            try {
+				node = getToolContentHandler().uploadFile(file.getInputStream(), fileName, 
+				        file.getContentType(), fileType);
+			} catch (InvalidParameterException e) {
+				throw new ForumException("FileNotFoundException occured while trying to upload File" + e.getMessage());
+			} catch (FileNotFoundException e) {
+				throw new ForumException("FileNotFoundException occured while trying to upload File" + e.getMessage());
+			} catch (RepositoryCheckedException e) {
+				throw new ForumException("FileNotFoundException occured while trying to upload File" + e.getMessage());
+			} catch (IOException e) {
+				throw new ForumException("FileNotFoundException occured while trying to upload File" + e.getMessage());
+			}
+          }
+        return node;
+    }
+
+	/**
+	 * This method deletes the content with the given <code>uuid</code> and
+	 * <code>versionID</code> from the content repository
+	 * 
+	 * @param uuid
+	 *            The <code>uuid</code> of the node to be deleted
+	 * @param versionID
+	 *            The <code>version_id</code> of the node to be deleted.
+	 * @throws SubmitFilesException
+	 */
+	public void deleteFromRepository(Long uuid, Long versionID)
+			throws ForumException {
+		ITicket ticket = getRepositoryLoginTicket();
+		try {
+			repositoryService.deleteVersion(ticket, uuid,versionID);
+		} catch (Exception e) {
+			throw new ForumException(
+					"Exception occured while deleting files from"
+							+ " the repository " + e.getMessage());
+		}
+	}
+
+	public void deleteInstructionFile(Long contentID, Long uuid, Long versionID, String type){
+		forumDao.deleteInstrcutionFile(contentID, uuid, versionID, type);
+	}
+
+	public ForumToolContentHandler getToolContentHandler() {
+		return toolContentHandler;
+	}
+
+	public void setToolContentHandler(ForumToolContentHandler toolContentHandler) {
+		this.toolContentHandler = toolContentHandler;
+	}
+	/**
+	 * This method verifies the credentials of the SubmitFiles Tool and gives it
+	 * the <code>Ticket</code> to login and access the Content Repository.
+	 * 
+	 * A valid ticket is needed in order to access the content from the
+	 * repository. This method would be called evertime the tool needs to
+	 * upload/download files from the content repository.
+	 * 
+	 * @return ITicket The ticket for repostory access
+	 * @throws SubmitFilesException
+	 */
+	private ITicket getRepositoryLoginTicket() throws ForumException {
+		repositoryService = RepositoryProxy.getRepositoryService();
+		ICredentials credentials = new SimpleCredentials(
+				toolContentHandler.getRepositoryUser(),
+				toolContentHandler.getRepositoryId());
+		try {
+			ITicket ticket = repositoryService.login(credentials,
+					toolContentHandler.getRepositoryWorkspaceName());
+			return ticket;
+		} catch (AccessDeniedException ae) {
+			throw new ForumException("Access Denied to repository."
+					+ ae.getMessage());
+		} catch (WorkspaceNotFoundException we) {
+			throw new ForumException("Workspace not found."
+					+ we.getMessage());
+		} catch (LoginException e) {
+			throw new ForumException("Login failed." + e.getMessage());
+		}
+	}
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
===================================================================
diff -u -ree36bb343b77214b9bffd9a8e47dd9e8caa25813 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision ee36bb343b77214b9bffd9a8e47dd9e8caa25813)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -1,5 +1,7 @@
 package org.lamsfoundation.lams.tool.forum.service;
 
+import org.apache.struts.upload.FormFile;
+import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
 import org.lamsfoundation.lams.tool.forum.persistence.Forum;
 import org.lamsfoundation.lams.tool.forum.persistence.Message;
 import org.lamsfoundation.lams.tool.forum.core.PersistenceException;
@@ -20,6 +22,8 @@
     public Forum createForum(Forum forum, Map attachments, Map topics) throws PersistenceException;
     public Forum editForum(Forum forum, Map attachments, Map topics) throws PersistenceException;
     public Forum getForum(Long forumId) throws PersistenceException;
+    public Forum getForumByContentId(Long contentID) throws PersistenceException;
+    
     public void deleteForum(Long forumId) throws PersistenceException;
     public List getTopics(Long forumId) throws PersistenceException;
     public void deleteForumAttachment(Long attachmentId) throws PersistenceException;
@@ -28,5 +32,8 @@
     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);
+	public void deleteInstructionFile(Long contentID, Long uuID, Long versionID, String type);
+	public void deleteFromRepository(Long uuID, Long versionID);
 
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
diff -u -ree36bb343b77214b9bffd9a8e47dd9e8caa25813 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision ee36bb343b77214b9bffd9a8e47dd9e8caa25813)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -9,10 +9,15 @@
  */
 public interface ForumConstants {
     public final static int MAX_FILE_SIZE = 250 * 1000;
-   
-    public final static String FORUM_MANAGER = "forumManager";
+    public final static String FORUM_SERVICE = "forumService";
+    
     public final static String CONTENT_HANDLER = "toolContentHandler";
 
-	public static final String TOOL_CONTENT_ID = "toolContentID";
+	public static final String TOOL_CONTENT_ID = "contentId";
     
+	public static final String AUTHORING_DTO = "authoring";
+	public static final String AUTHORING_TOPICS = "topics";
+	public static final String AUTHORING_TOPICS_LIST = "topicList";
+	public static final String AUTHORING_ATTACHMENT = "attachment";
+	public static final String DEFAULT_TITLE = "Forum";
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties
===================================================================
diff -u -rb1ef965ad3a0cd4ea7bb807bd313d1f0cf68d1e7 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b1ef965ad3a0cd4ea7bb807bd313d1f0cf68d1e7)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -7,6 +7,7 @@
 label.authoring.heading.instructions.desc=Please input online and offline instructions
 label.authoring.heading.advance=Forum Advance
 label.authoring.heading.advance.desc=Please input advance options for Forum 
+label.authoring.create.new.topic=Create a new topic
 
 label.authoring.basic.title=Title
 label.authoring.basic.instruction=Instruction
@@ -73,6 +74,7 @@
 title.message.edit = Edit Message
 message.label.subject = Subject
 message.label.body = Body
+message.label.attachment = Attachment
 message.label.postedOn = Posted On:
 message.label.threadReplies  = Thread Replies
 message.link.reply = Reply
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(revision 0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -0,0 +1,367 @@
+/*
+ *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.web.actions;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.beanutils.PropertyUtils;
+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.upload.FormFile;
+import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
+import org.lamsfoundation.lams.tool.forum.core.PersistenceException;
+import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
+import org.lamsfoundation.lams.tool.forum.persistence.Forum;
+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.ForumForm;
+import org.lamsfoundation.lams.tool.forum.web.forms.MessageForm;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ * @author Steve.Ni
+ * @version $Revision$
+ */
+public class AuthoringAction extends Action {
+	private static Logger log = Logger.getLogger(AuthoringAction.class);
+	private IForumService forumService;
+	
+	public ActionForward execute(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException, PersistenceException {
+		
+		String param = mapping.getParameter();
+	  	if (param.equals("initPage")) {
+       		return initPage(mapping, form, request, response);
+        }
+	  	if (param.equals("newTopic")) {
+       		return newTopic(mapping, form, request, response);
+        }
+	  	if (param.equals("createTopic")) {
+       		return createTopic(mapping, form, request, response);
+        }
+        if (param.equals("deleteTopic")) {
+       		return deleteTopic(mapping, form, request, response);
+        }
+        if (param.equals("updateContent")) {
+       		return updateContent(mapping, form, request, response);
+        }
+        if (param.equals("uploadOnline")) {
+       		return uploadOnline(mapping, form, request, response);
+        }
+        if (param.equals("uploadOffline")) {
+       		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");
+	}
+
+	/**
+	 * This page will display initial submit tool content. Or just a blank page if the toolContentID does not
+	 * exist before. 
+	 *  
+	 * @see org.apache.struts.actions.DispatchAction#unspecified(org.apache.struts.action.ActionMapping,
+	 *      org.apache.struts.action.ActionForm,
+	 *      javax.servlet.http.HttpServletRequest,
+	 *      javax.servlet.http.HttpServletResponse)
+	 */
+	protected ActionForward initPage(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response) {
+
+		
+		Long contentId = new Long(WebUtil.readLongParam(request,ForumConstants.TOOL_CONTENT_ID));
+		
+		//get back the topic list and display them on page
+		forumService = getForumManager();
+		
+		List topics = null;
+		Forum forum = null;
+		try {
+			forum = forumService.getForumByContentId(contentId);
+			if(forum != null){
+				topics = forumService.getTopics(forum.getUid());
+				((ForumForm)form).setForum(forum);
+			}
+		} 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);
+		return mapping.getInputForward();
+	}
+
+	private ActionForward newTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+		Map topics = (Map) request.getSession().getAttribute(ForumConstants.AUTHORING_TOPICS);
+		if (topics == null) {
+			topics = new HashMap();
+		}
+		request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS, topics);
+		request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, new ArrayList(topics.values()));
+		return mapping.findForward("success");
+	}
+	public ActionForward createTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws IOException, ServletException, PersistenceException {
+		MessageForm messageForm = (MessageForm) form;
+		Message message = messageForm.getMessage();
+		Map topics = (Map) request.getSession().getAttribute(ForumConstants.AUTHORING_TOPICS);
+		if (topics == null) {
+			topics = new HashMap();
+		}
+		topics.put(message.getSubject(), message);
+		request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS, topics);
+		request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, new ArrayList(topics.values()));
+		return mapping.findForward("success");
+	}
+
+    public ActionForward deleteTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws PersistenceException {
+		String topicName = (String) request.getParameter("topicName");
+		Map topics = (Map) request.getSession().getAttribute(ForumConstants.AUTHORING_TOPICS);
+		Message topic = (Message) topics.remove(topicName);
+		if (topic.getUid() != null) {
+			getForumManager().deleteMessage(topic.getUid());
+		}
+		request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS, topics);
+		request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, new ArrayList(topics.values()));
+		return mapping.findForward("success");
+	}
+
+	/**
+	 * Update all content for submit tool except online/offline instruction
+	 * files list.
+	 * 
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	public ActionForward updateContent(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response) {
+
+		ForumForm forumForm = (ForumForm)(form);
+		Forum forum = forumForm.getForum();
+		Map topics = (Map) request.getSession().getAttribute(ForumConstants.AUTHORING_TOPICS);
+		Map attachment = (Map) request.getSession().getAttribute(ForumConstants.AUTHORING_ATTACHMENT);
+		
+		try {
+			forumService = getForumManager();
+			Forum persistContent = forumService.getForum(forum.getContentId());
+			if(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
+				forumService.createForum(forum,attachment,topics);
+		} catch (Exception e) {
+			log.error(e);
+		}
+		return mapping.findForward("success");
+	}
+	/**
+	 * Handle upload online instruction files request. Once the file uploaded successfully, database
+	 * will update accordingly. 
+	 * 
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	public ActionForward uploadOnline(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response) {
+		return uploadFile(mapping, form, IToolContentHandler.TYPE_ONLINE,request);
+	}
+	/**
+	 * Handle upload offline instruction files request. Once the file uploaded successfully, database
+	 * will update accordingly. 
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	public ActionForward uploadOffline(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response) {
+		return uploadFile(mapping, form, IToolContentHandler.TYPE_OFFLINE,request);
+	}
+	/**
+	 * Common method to upload online or offline instruction files request.
+	 * @param mapping
+	 * @param form
+	 * @param type
+	 * @param request
+	 * @return
+	 */
+	private ActionForward uploadFile(ActionMapping mapping, ActionForm form,
+			String type,HttpServletRequest request) {
+
+		ForumForm forumForm = (ForumForm) form;
+		
+		FormFile file;
+		if(StringUtils.equals(IToolContentHandler.TYPE_OFFLINE,type))
+			file = (FormFile) forumForm.getOfflineFile();
+		else
+			file = (FormFile) forumForm.getOnlineFile();
+		
+		Forum content = getContent(form);
+		forumService = getForumManager();
+		Attachment att = forumService.uploadInstructionFile(content.getContentId(), file, type);
+		//update session
+		Map attachmentMap = (Map) request.getSession().getAttribute(ForumConstants.AUTHORING_ATTACHMENT);
+		attachmentMap.put(att.getUuid(),att);
+//		request.getSession().setAttribute(ForumConstants.AUTHORING_ATTACHMENT,attachmentMap);
+		return mapping.getInputForward();
+
+	}
+
+	public ActionForward deleteOfflineFile(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response) {
+		return deleteFile(request, response,IToolContentHandler.TYPE_OFFLINE);
+	}
+	public ActionForward deleteOnlineFile(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response) {
+		return deleteFile(request, response,IToolContentHandler.TYPE_ONLINE);
+	}
+
+	/**
+	 * @param request
+	 * @param response
+	 * @param type 
+	 * @return
+	 */
+	private ActionForward deleteFile(HttpServletRequest request, HttpServletResponse response, String type) {
+		Long contentID = new Long(WebUtil.readLongParam(request,ForumConstants.TOOL_CONTENT_ID));
+		Long versionID = new Long(WebUtil.readLongParam(request,"versionID"));
+		Long uuID = new Long(WebUtil.readLongParam(request,"uuID"));
+		
+		forumService = getForumManager();
+		forumService.deleteFromRepository(uuID,versionID);
+		Map attachmentMap = (Map) request.getSession().getAttribute(ForumConstants.AUTHORING_ATTACHMENT);
+		Attachment attachment = (Attachment) attachmentMap.remove(uuID);
+		if (attachment.getUid() != null) {
+			forumService.deleteInstructionFile(contentID,uuID,versionID,type);
+		}
+//		request.getSession().setAttribute(ForumConstants.AUTHORING_ATTACHMENT,attachmentMap);
+		
+		Iterator iter = attachmentMap.values().iterator();
+		List list = new ArrayList();
+		while(iter.hasNext()){
+			attachment = (Attachment) iter.next();
+			if(StringUtils.equals(type,attachment.getType()))
+				list.add(attachment);
+		}
+		
+		StringBuffer sb = new StringBuffer();
+		iter = list.iterator();
+		while(iter.hasNext()){
+			Attachment file = (Attachment) iter.next();
+			sb.append("<li>").append(file.getFileName()).append("\r\n");
+			sb.append(" <a href=\"javascript:launchInstructionsPopup('download/?uuid=").append(file.getUuid()).append("&preferDownload=false')\">");
+			sb.append(this.getResources(request).getMessage("label.view"));
+			sb.append("</a>\r\n");
+			sb.append(" <a href=\"../download/?uuid=").append(file.getUuid()).append("&preferDownload=true\">");
+			sb.append(this.getResources(request).getMessage("label.download"));
+			sb.append("</a>\r\n");
+			sb.append("<a href=\"javascript:loadDoc('/lams/tool/lasbmt11/deletefile.do?method=");
+			if(StringUtils.equals(type,IToolContentHandler.TYPE_OFFLINE))
+				sb.append("deleteOffline");
+			else
+				sb.append("deleteOnline");
+			sb.append("File&toolContentID=").append(contentID);
+			sb.append("&uuID=").append(file.getUuid()).append("&versionID=").append(file.getVersionId()).append("','");
+			if(StringUtils.equals(type,IToolContentHandler.TYPE_OFFLINE))
+				sb.append("offlinefile");
+			else
+				sb.append("onlinefile");
+			sb.append("')\">");
+			
+			if(StringUtils.equals(type,IToolContentHandler.TYPE_OFFLINE))
+				sb.append(this.getResources(request).getMessage("label.authoring.offline.delete"));
+			else
+				sb.append(this.getResources(request).getMessage("label.authoring.online.delete"));
+			sb.append("</a></li>\r\n");
+		}
+		try {
+			PrintWriter out = response.getWriter();
+			out.print(sb.toString());
+			out.flush();
+		} catch (IOException e) {
+			log.error(e);
+		}
+		return null;
+	}
+
+	/**
+	 * The private method to get content from ActionForm parameters (web page).
+	 * 
+	 * @param form
+	 * @return
+	 */
+	private Forum getContent(ActionForm form) {
+		ForumForm authForm = (ForumForm) form;
+		Forum forum = authForm.getForum();
+		
+		Forum content = new Forum();
+		try {
+			PropertyUtils.copyProperties(forum,content);
+		} catch (Exception e) {
+			log.error(e);
+		} 
+		return content;
+	}
+
+  	private IForumService getForumManager() {
+  	    if ( forumService == null ) {
+  	      WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
+  	      forumService = (IForumService) wac.getBean(ForumConstants.FORUM_SERVICE);
+  	    }
+  	    return forumService;
+  	}
+}
Fisheye: Tag 0653e8df3351a6178f4dcb842f4eda25a3d2341b refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthroingAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0653e8df3351a6178f4dcb842f4eda25a3d2341b refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ForumAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java
===================================================================
diff -u -re16f09694ef763b1acafa32958762c90332b8228 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java	(.../ForumForm.java)	(revision e16f09694ef763b1acafa32958762c90332b8228)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java	(.../ForumForm.java)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -17,27 +17,22 @@
  * 	Message Form.
  *	@struts.form name="forumForm"
  *
- *  Created by IntelliJ IDEA.
  * User: conradb
  * Date: 10/06/2005
  * Time: 15:44:36
- * To change this template use File | Settings | File Templates.
  */
 public class ForumForm extends ValidatorForm {
-    protected Forum forum;
+	private static final long serialVersionUID = -6054354910960460120L;
+    private int currentTab;
     private FormFile offlineFile;
     private FormFile onlineFile;
-    protected Map attachments;
-    protected boolean lockWhenFinished;
-    protected boolean forceOffline;
-    protected boolean allowAnnomity;
+    private Forum forum;
 
     private static Logger logger = Logger.getLogger(ForumForm.class.getName());
 
     public ForumForm() {
         this.forum = new Forum();
         this.forum.setTitle("New Forum");
-        this.attachments = new HashMap();
     }
 
     public void setForum(Forum forum) {
@@ -64,38 +59,7 @@
         return offlineFile;
     }
 
-    public boolean getAllowAnnomity() {
-        return allowAnnomity;
-    }
 
-    public void setAllowAnnomity(boolean allowAnnomity) {
-        this.allowAnnomity = allowAnnomity;
-    }
-
-    public boolean getLockWhenFinished() {
-        return lockWhenFinished;
-    }
-
-    public void setLockWhenFinished(boolean lockWhenFinished) {
-        this.lockWhenFinished = lockWhenFinished;
-    }
-
-    public boolean getForceOffline() {
-        return forceOffline;
-    }
-
-    public void setForceOffline(boolean forceOffline) {
-        this.forceOffline = forceOffline;
-    }
-
-    public void setAttachments(Map attachments) {
-        this.attachments = attachments;
-    }
-
-    public Map getAttachments() {
-        return this.attachments;
-    }
-
     private float convertToMeg( int numBytes ) {
         return numBytes != 0 ? numBytes / 1024 / 1024 : 0;
     }
@@ -125,4 +89,11 @@
         return errors;
     }
 
+	public int getCurrentTab() {
+		return currentTab;
+	}
+
+	public void setCurrentTab(int currentTab) {
+		this.currentTab = currentTab;
+	}
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java
===================================================================
diff -u -r7060aa6f074c868f788f691954fda90b391c9039 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java	(.../MessageForm.java)	(revision 7060aa6f074c868f788f691954fda90b391c9039)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java	(.../MessageForm.java)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -5,32 +5,31 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionError;
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
 import org.lamsfoundation.lams.tool.forum.persistence.Message;
 
 /**
  *
  * 	Message Form.
  *	@struts.form name="messageForm"
  *
- * Created by IntelliJ IDEA.
  * User: conradb
  * Date: 10/06/2005
  * Time: 15:44:47
- * To change this template use File | Settings | File Templates.
  */
 public class MessageForm extends ValidatorForm {
+	private static Logger logger = Logger.getLogger(ForumForm.class.getName());
     protected Message message;
     protected Long forumId;
     protected Long parentId;
     protected Long topicId;
-    private static Logger logger = Logger.getLogger(ForumForm.class.getName());
 
     public MessageForm() {
-        this.message = new Message();
+    	message = new Message();
     }
 
     public void setMessage(Message message) {
-        this.message = message;
+    	this.message = message;
     }
 
     public Message getMessage() {
Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/ForumTest.java
===================================================================
diff -u -rc109ffd9f84d13dabeeb31bafe8484c0f3a26b40 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/ForumTest.java	(.../ForumTest.java)	(revision c109ffd9f84d13dabeeb31bafe8484c0f3a26b40)
+++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/ForumTest.java	(.../ForumTest.java)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -52,8 +52,8 @@
         //load
         Forum reloaded = (Forum) dao.getById(entity.getUid());
         //just because MySQL will wrap millisecond to zero. it is nonsesnce to compare data at this care.
-        entity.setCreated(reloaded.created);
-        entity.setUpdated(reloaded.updated);
+        entity.setCreated(reloaded.getCreated());
+        entity.setUpdated(reloaded.getUpdated());
         assertEquals("reloaded object not equal", entity, reloaded);
         assertEquals("date difference in database and memory", entity.getCreated().getTime()/1000, reloaded.getCreated().getTime()/1000);
         assertEquals("date difference in database and memory", entity.getUpdated().getTime()/1000, reloaded.getUpdated().getTime()/1000);
Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/MessageTest.java
===================================================================
diff -u -rc109ffd9f84d13dabeeb31bafe8484c0f3a26b40 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/MessageTest.java	(.../MessageTest.java)	(revision c109ffd9f84d13dabeeb31bafe8484c0f3a26b40)
+++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/MessageTest.java	(.../MessageTest.java)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -51,8 +51,8 @@
         //load
         Message reloaded = (Message) messageDao.getById(message.getUid());
         //just because MySQL will wrap millisecond to zero. it is nonsesnce to compare data at this care.
-        message.setCreated(reloaded.created);
-        message.setUpdated(reloaded.updated);
+        message.setCreated(reloaded.getCreated());
+        message.setUpdated(reloaded.getUpdated());
         assertEquals("reloaded message not equal", message, reloaded);
         assertEquals("reloaded message body should be: Test Message", "Test Message", reloaded.getBody());
         assertEquals("reloaded message Subject should be: Test Message", "Test Message", reloaded.getSubject());
@@ -75,8 +75,8 @@
         messageDao.saveOrUpdate(message2);
         Message reloaded2 = (Message) messageDao.getById(message2.getUid());
         //just because MySQL will wrap millisecond to zero. it is nonsesnce to compare data at this care.
-        message2.setCreated(reloaded2.created);
-        message2.setUpdated(reloaded2.updated);
+        message2.setCreated(reloaded2.getCreated());
+        message2.setUpdated(reloaded2.getUpdated());
 
         assertEquals("reloaded message not equal", message2, reloaded2);
         assertEquals("reloaded message body should be: Test Message", "Test Message2", reloaded2.getBody());
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -ree36bb343b77214b9bffd9a8e47dd9e8caa25813 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision ee36bb343b77214b9bffd9a8e47dd9e8caa25813)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -42,227 +42,84 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
 
-   	 <!-- ========== Action Mapping Definitions ============================== -->
+   		<!-- ========== Action Mapping Definitions ============================== -->
 
-    <action path="/index"
-		type="org.apache.struts.actions.ForwardAction" parameter="tiles:/layout" />
+		<action path="/authoring"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
+			name="forumForm" 
+			scope="request" 
+			input="/jsps/authoring/authoring.jsp"
+			parameter="action" 
+			validate="true">
+			<forward name="success" path="/jsps/authoring/success.jsp" />
+		</action>
 
-	<action path="/error"
-		type="org.apache.struts.actions.ForwardAction"
-		parameter="tiles:/error" />
-
-	<action path="/blank"
-		type="org.apache.struts.actions.ForwardAction"
-		parameter="tiles:/blank" />
-
-      	<!-- Forum  related actions -->
-    <action
-      path="/authoring"
-      type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-      name="forumForm"
-      scope="request"
-      input="/authoring/authoring.jsp"
-      parameter="action"
-      unknown="false"
-      validate="true"
-	>
-      <forward
-        name="success"
-        path="/authoring/success.jsp"
-        redirect="false"
-      />
-    </action>
-	    <action path="/authoring/forum/create"
-		    type="org.apache.struts.actions.ForwardAction" parameter="tiles:/authoring/forum/create" />
-
-	    <action path="/authoring/forum/edit"
-		    type="org.apache.struts.actions.ForwardAction" parameter="tiles:/authoring/forum/edit" />
-
-        <action    path="/authoring/forum/instructions"
-        	type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			name="forumForm"
-			validate="true"
-            input="/authoring/forum/create.do?selected=2"
-			parameter="instructions"
-			scope="session">
-            <forward name="success"		path="/authoring/forum/create.do?selected=2"/>
-        </action>
-
-        <action    path="/authoring/forum/editInstructions"
-            type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-            name="forumForm"
-            validate="true"
-            input="/authoring/forum/edit.do?selected=2"
-            parameter="instructions"
-            scope="session">
-            <forward name="success"		path="/authoring/forum/edit.do?selected=2"/>
-        </action>
-
-        <action    path="/authoring/forum/advanced"
-        	type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			name="forumForm"
-			validate="true"
-            input="/authoring/forum/create.do?selected=1"
-			parameter="advanced"
-			scope="session">
-            <forward name="success"		path="/authoring/forum/create.do?selected=1"/>
-        </action>
-
-        <action    path="/authoring/forum/editAdvanced"
-        	type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			name="forumForm"
-			validate="true"
-            input="/authoring/forum/edit.do?selected=1"
-			parameter="advanced"
-			scope="session">
-            <forward name="success"		path="/authoring/forum/edit.do?selected=1"/>
-        </action>
-
-        <action    path="/authoring/forum/createForum"
+		<action path="/authoring/forum/newTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			name="forumForm"
-			validate="true"
-            input="tiles:/authoring/forum/create"
-			parameter="createForum"
-			scope="session">
-            <forward name="success"		path="tiles:/authoring/forum/edit"/>
-        </action>
-
-        <action    path="/authoring/forum/getForum"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			parameter="getForum"
-			scope="session">
-            <forward name="success"		path="tiles:/authoring/forum/edit"/>
-        </action>
-
-		<action    path="/authoring/forum/editForum"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			name="forumForm"
-			validate="true"
-            input="/authoring/forum/edit.do"
-			parameter="editForum"
-			scope="session">
-			<forward name="success"		path="/authoring/forum/edit.do"/>
+			parameter="newTopic">
+			<forward name="success" path="tiles:/authoring/forum/newTopic" />
 		</action>
-
-        <action    path="/authoring/forum/deleteAttachment"
+		<action path="/authoring/forum/createTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			name="forumForm"
+			name="messageForm" 
 			validate="true"
-			parameter="deleteAttachment"
-			scope="session">
-            <forward name="success"		path="/authoring/forum/create.do?selected=2"/>
-        </action>
-
-        <action    path="/authoring/forum/edit/deleteAttachment"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			name="forumForm"
-			validate="true"
-			parameter="deleteAttachment"
-			scope="session">
-            <forward name="success"		path="/authoring/forum/edit.do?selected=2"/>
-        </action>
-
-	    <action path="/authoring/forum/newTopic"
-		    type="org.apache.struts.actions.ForwardAction" parameter="tiles:/authoring/forum/newTopic" />
-
-		<action    path="/authoring/forum/createTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			name="messageForm"
-			validate="true"
-            input="tiles:/authoring/forum/newTopic"
+			input="tiles:/authoring/forum/newTopic" 
 			parameter="createTopic"
 			scope="request">
-            <forward name="success"		path="tiles:/authoring/forum/create"/>
+			<forward name="success" path="tiles:/authoring/forum/newTopic" />
 		</action>
-
-        <action    path="/authoring/forum/deleteTopic"
+		<action path="/authoring/forum/deleteTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-            input="tiles:/authoring/forum/create"
+			input="tiles:/authoring/forum/create" 
 			parameter="deleteTopic"
-            scope="request">
-            <forward name="success"		path="tiles:/authoring/forum/create"/>
-        </action>
-
-        <action    path="/authoring/forum/edit/deleteTopic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-            input="tiles:/authoring/forum/create"
-			parameter="deleteTopic"
-            scope="request">
-            <forward name="success"		path="tiles:/authoring/forum/edit"/>
-        </action>
-
-        <action    path="/authoring/forum/getForum"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			validate="true"
-			parameter="getForum"
 			scope="request">
-			<forward name="success"		path="tiles:/authoring/forum/edit"/>
 		</action>
-
-		<action    path="/authoring/forum/delete"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			parameter="deleteForum"
-			scope="request">
-			<forward name="success"		path="titles:/authoring/forum/success"/>
-		</action>
-
 		<!-- Message related actions -->
-
-    	<action    path="/learning/forum/open"
+		<action path="/learning/forum/open"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			parameter="openForum"
-			scope="request">
-			<forward name="success"		path="tiles:/learning/forum/open"/>
+			parameter="openForum" scope="request">
+			<forward name="success" path="tiles:/learning/forum/open" />
 		</action>
-
-    	<action    path="/learning/message/openTopic"
+		<action path="/learning/message/openTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			parameter="openTopic"
-			scope="request">
-			<forward name="success"		path="tiles:/learning/message/open"/>
+			parameter="openTopic" scope="request">
+			<forward name="success" path="tiles:/learning/message/open" />
 		</action>
-
-    	<action    path="/learning/message/getMessage"
+		<action path="/learning/message/getMessage"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			parameter="getMessage"
-			scope="request">
-			<forward name="success"		path="tiles:/learning/message/getMessage"/>
+			parameter="getMessage" scope="request">
+			<forward name="success" path="tiles:/learning/message/getMessage" />
 		</action>
-
-    	<action    path="/learning/message/post"
-		     type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			parameter="post"
-			scope="request">
-			<forward name="success"		path="tiles:/learning/message/post"/>
+		<action path="/learning/message/post"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			parameter="post" scope="request">
+			<forward name="success" path="tiles:/learning/message/post" />
 		</action>
-
-		<action    path="/learning/message/reply"
+		<action path="/learning/message/reply"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			name="messageForm"
-			validate="true"
-			input="tiles:/learning/message/post"
-			parameter="reply"
-			scope="request">
-			<forward name="success"		path="/learning/message/openTopic.do"/>
+			name="messageForm" validate="true" input="tiles:/learning/message/post"
+			parameter="reply" scope="request">
+			<forward name="success" path="/learning/message/openTopic.do" />
 		</action>
-
-		<action    path="/learning/message/editMessage"
+		<action path="/learning/message/editMessage"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			name="messageForm"
-			validate="true"
-			input="tiles:/learning/message/getMessage"
-			parameter="editMessage"
+			name="messageForm" validate="true"
+			input="tiles:/learning/message/getMessage" parameter="editMessage"
 			scope="request">
-			<forward name="success"		path="/learning/message/openTopic.do"/>
+			<forward name="success" path="/learning/message/openTopic.do" />
 		</action>
-
-		<action    path="/learning/message/delete"
+		<action path="/learning/message/delete"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.ForumAction"
-			parameter="deleteMessage"
-			scope="request">
-			<forward name="success"		path="/learing/message/open.do"/>
+			parameter="deleteMessage" scope="request">
+			<forward name="success" path="/learing/message/open.do" />
 		</action>
+		<!-- System level actions -->
+		<action path="/index" type="org.apache.struts.actions.ForwardAction"
+			parameter="tiles:/layout" />
+		<action path="/error" type="org.apache.struts.actions.ForwardAction"
+			parameter="tiles:/error" />
+		<action path="/blank" type="org.apache.struts.actions.ForwardAction"
+			parameter="tiles:/blank" />
 
   </action-mappings>
 
Index: lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r4296cc24afab0a22b2075656b93b7bad7578e32f -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
+++ lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -15,28 +15,17 @@
 		at the top of the page
 	-->
 	<definition name="tiles:layout" path="/includes/layout.jsp">
-    	<put name="pageIcon" value="icon_settings_s.gif"/>
     	<put name="pageTitleKey" value=""/>
     	<put name="body" value=""/>
     	<put name="header" value="/includes/header.jsp"/>
     	<put name="footer" value="/includes/footer.jsp"/>
 	</definition>
 
-    <definition name="tiles:/authoring/forum/create" path="/includes/tabsLayout.jsp" >
-       	<put name="pageIcon" value="icon_settings_s.gif"/>
-       	<put name="pageTitleKey" value="title.forum.add"/>
-        <put name="selectedIndex" value="0" />
-        <put name="parameterName" value="selected" />
-        <put name="actionName" value="/authoring/forum/create.do" />
-        <put name="header" value="/includes/header.jsp"/>
-        <put name="footer" value="/includes/footer.jsp"/>
-        <putList name="tabList" >
-            <item value="Basic" link="/jsps/authoring/forum/basic.jsp" classtype="org.apache.struts.tiles.beans.SimpleMenuItem" />
-            <item value="Advanced" link="/jsps/authoring/forum/advanced.jsp" classtype="org.apache.struts.tiles.beans.SimpleMenuItem" />
-            <item value="Instructions" link="/jsps/authoring/forum/instructions.jsp" classtype="org.apache.struts.tiles.beans.SimpleMenuItem" />
-        </putList>
-    </definition>
-
+    <definition name="tiles:/authoring/forum/newTopic" extends="tiles:layout">
+    	<put name="pageTitleKey" value="title.message.add"/>
+    	<put name="body" value="/jsps/authoring/message/create.jsp"/>
+	</definition>
+	
     <definition name="tiles:/authoring/forum/edit" path="/includes/tabsLayout.jsp" >
        	<put name="pageIcon" value="icon_settings_s.gif"/>
        	<put name="pageTitleKey" value="title.forum.edit"/>
@@ -83,12 +72,7 @@
     	<put name="body" value="/jsps/authoring/forum/success.jsp"/>
 	</definition>
 
-    <definition name="tiles:/authoring/forum/newTopic" extends="tiles:layout">
-    	<put name="pageTitleKey" value="title.message.add"/>
-    	<put name="body" value="/jsps/authoring/message/create.jsp"/>
-	</definition>
 
-
     <definition name="tiles:/authoring/message/edit" extends="tiles:layout">
     	<put name="pageTitleKey" value="title.message.delete"/>
     	<put name="body" value="/jsps/authoring/message/edit.jsp"/>
Index: lams_tool_forum/web/includes/header.jsp
===================================================================
diff -u -rffbc47494b72d5222b6fc95db0347f7732d93310 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/web/includes/header.jsp	(.../header.jsp)	(revision ffbc47494b72d5222b6fc95db0347f7732d93310)
+++ lams_tool_forum/web/includes/header.jsp	(.../header.jsp)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -1,19 +1,11 @@
 <%@ include file="/includes/taglibs.jsp" %>
 <%
-String protocol = request.getProtocol();
-if(protocol.startsWith("HTTPS")){
-	protocol = "https://";
-}else{
-	protocol = "http://";
-}
-String pathToRoot = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/";
-String pathToShare = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/../../../..";
+ String LAMS_WEB_ROOT="/lams";
 %>
 <head>
 <title><bean:message key="appName" /></title>
-<link href='<html:rewrite page="/includes/style.jsp" />' rel="stylesheet" type="text/css" />	
-<script src='<%=pathToShare%>/includes/javascript/common.jsp'></script>
-<script src='<html:rewrite page="/includes/scripts.jsp" />'></script>
+<link href="<%=LAMS_WEB_ROOT%>/css/aqua.css" rel="stylesheet" type="text/css">
+<script src='<%=LAMS_WEB_ROOT%>/includes/javascript/common.jsp'></script>
 <script src='<html:rewrite page="/includes/validator.jsp" />'></script>
 </head>
 
Index: lams_tool_forum/web/includes/layout.jsp
===================================================================
diff -u -r4296cc24afab0a22b2075656b93b7bad7578e32f -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/web/includes/layout.jsp	(.../layout.jsp)	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
+++ lams_tool_forum/web/includes/layout.jsp	(.../layout.jsp)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -1,23 +1,20 @@
-<%@ include file="/includes/taglibs.jsp" %>
-<%@ taglib uri="/WEB-INF/struts/struts-tiles.tld" prefix="tiles" %>
+<%@ include file="/includes/taglibs.jsp"%>
+<%@ taglib uri="/WEB-INF/struts/struts-tiles.tld" prefix="tiles"%>
 <html>
-<tiles:insert attribute="header"/>
+<tiles:insert attribute="header" />
 <body>
-<tiles:useAttribute name="pageTitleKey" scope="request"/>
-<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
-<tiles:useAttribute name="pageIcon" scope="request"/>
-<bean:define name="pageIcon" id="pIcon" type="String" />
-<logic:notEmpty name="pTitleKey">
-<table border="0" cellpadding="0" cellspacing="0">
-<tr>
-	<logic:notEmpty name="pIcon">
-	<td colspan="2" bgcolor="#F9F9F5" background="<html:rewrite page="/images/back_subSection.gif" />"><html:img 
-		page='<%= "/images/" + pIcon %>' width="25" height="25" align="absmiddle" /><b class="subTitle"><bean:message key="<%=pTitleKey %>" /></b></td>
+
+	<tiles:useAttribute name="pageTitleKey" scope="request" />
+	<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
+	<logic:notEmpty name="pTitleKey">
+		<table border="0" cellpadding="0" cellspacing="0">
+			<tr>
+				<td><b class="subTitle"><bean:message key="<%=pTitleKey %>" /></b></td>
+			</tr>
+		</table>
 	</logic:notEmpty>
-</tr>
-</table>
-</logic:notEmpty>
-<tiles:insert attribute="body"/>
-<tiles:insert attribute="footer"/>
+
+	<tiles:insert attribute="body" />
+	<tiles:insert attribute="footer" />
 </body>
 </html>
Fisheye: Tag 0653e8df3351a6178f4dcb842f4eda25a3d2341b refers to a dead (removed) revision in file `lams_tool_forum/web/includes/style.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0653e8df3351a6178f4dcb842f4eda25a3d2341b refers to a dead (removed) revision in file `lams_tool_forum/web/includes/tabsLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/includes/taglibs.jsp
===================================================================
diff -u -r4296cc24afab0a22b2075656b93b7bad7578e32f -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/web/includes/taglibs.jsp	(.../taglibs.jsp)	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
+++ lams_tool_forum/web/includes/taglibs.jsp	(.../taglibs.jsp)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -2,4 +2,6 @@
 <%@ taglib uri="/WEB-INF/struts/struts-html.tld" prefix="html" %>
 <%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %>
 <%@ taglib uri="/WEB-INF/struts/struts-tiles.tld" prefix="tiles" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%>
 
Index: lams_tool_forum/web/jsps/authoring/authoring.jsp
===================================================================
diff -u -ree36bb343b77214b9bffd9a8e47dd9e8caa25813 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision ee36bb343b77214b9bffd9a8e47dd9e8caa25813)
+++ lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -23,7 +23,7 @@
 <body onLoad="initTabs();showTab('<c:out value='${currentTab}'/>');">
 
 <html:form action="authoring" method="post"	 enctype="multipart/form-data">
-		<html:hidden property="toolContentID"/>
+		<html:hidden property="contentId"/>
 		<html:hidden  property="currentTab" styleId="currentTab"/>
 
 <!-- start tabs -->
@@ -67,7 +67,6 @@
 </table>
     <!-- end tab buttons -->
 
-
 	<%@ include file="basic.jsp"%>
 	<%@ include file="instructions.jsp"%>
 	<%@ include file="advance.jsp"%>
Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
diff -u -ree36bb343b77214b9bffd9a8e47dd9e8caa25813 -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision ee36bb343b77214b9bffd9a8e47dd9e8caa25813)
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -1,52 +1,66 @@
+<script lang="javascript">
+<!-- Common Javascript functions for LAMS -->
+
+	/**
+	 * Launches the popup window for the instruction files
+	 */
+	function launchPopup(url) {
+		var instructionsWindow = null;
+// add the mac test back in when we have the platform detection working.
+//		if(mac){
+//			window.open(url,'instructions','resizable,width=796,height=570,scrollbars');
+//		}else{
+			if(instructionsWindow && instructionsWindow.open && !instructionsWindow.closed){
+				instructionsWindow.close();
+			}
+			instructionsWindow = window.open(url,'newtopic','resizable,width=796,height=570,scrollbars');
+			instructionsWindow.window.focus();
+//		}	
+	}
+</script>
+<!---------------------------Basic Tab Content ------------------------>
+<div id='content_b' class="tabbody content_b">
+<h1><fmt:message key="label.authoring.heading.basic" /></h1>
+<h2><fmt:message key="label.authoring.heading.basic.desc" /></h2>
+<table class="forms">
+	<tr>
+		<td class="formlabel"><fmt:message key="label.authoring.basic.title" />:</td>
+		<td class="formcontrol"><html:text property="title" /></td>
+	</tr>
+	<tr>
+		<td class="formlabel"><fmt:message
+			key="label.authoring.basic.instruction" />:</td>
+		<td class="formcontrol"><FCK:editor id="instructions"
+			basePath="/lams/fckeditor/" height="150" width="85%">
+			<c:out value="${authoring.instruction}" escapeXml="false" />
+		</FCK:editor></td>
+	</tr>
+	<!-- Topics List Row -->
+	<tr>
+		<td colspan="2" class="formcontrol"><c:if test="${!empty topicList}">
+			<%@ include file="/jsps/message/topiclist.jsp" %>
+		</c:if></td>
+	</tr>
+	<tr>
+		<td colspan="2" align="left">
+			<a href="javascript:launchPopup('<html:rewrite page="/authoring/forum/newTopic.do"/>');">
+				<fmt:message key="label.authoring.create.new.topic" />
+			</a>
+		</td>
+	</tr>
 	
-	<!---------------------------Basic Tab Content ------------------------>
-	<div id='content_b' class="tabbody content_b" >
-	<h1><fmt:message key="label.authoring.heading.basic" /></h1>
-	<h2><fmt:message key="label.authoring.heading.basic.desc" /></h2>
-	<table class="forms">
-		<tr>
-			<td class="formlabel"><fmt:message key="label.authoring.basic.title" />:</td>
-			<td class="formcontrol"><html:text property="title" /></td>
-		</tr>
-		<tr>
-			<td class="formlabel"><fmt:message key="label.authoring.basic.instruction" />:</td>
-			<td class="formcontrol"><FCK:editor id="instructions"
-				basePath="/lams/fckeditor/" height="150" width="85%">
-				<c:out value="${authoring.instruction}" escapeXml="false"/>
-			</FCK:editor></td>
-		</tr>
-		<!-- Button Row -->
-		<tr><td colspan="2"><html:errors/></td></tr>
-		<tr>
-			<td colspan="2" class="formcontrol"><html:button property="cancel"
-				onclick="window.close()">
-				<fmt:message key="label.authoring.cancel.button" />
-				</html:button>
-				<html:submit property="action">
-					<fmt:message key="label.authoring.save.button" />
-				</html:submit>
-			</td>
-		</tr>
-	</table>
-	<c:if test="${!empty topicList}">
-         <div align="center">
-            <table width="100%" cellspacing="8" align="CENTER"  style="background-color:#ffffff;"  cellspacing="3" cellpadding="3">
-            <tr>
-              		<td valign="MIDDLE"><b>Topic</b></td>
-                    <td colspan="2"/>
-            </tr>
-            <c:forEach items="${topicList}" var="topic">
-	            <tr>
-	             	<td valign="MIDDLE">
-	             	<c:out value="${topic.subject}"/></td>
-	                <td colspan="2" valign="MIDDLE">
-		                <html:link page="/authoring/forum/deleteTopic.do?topicName=${topic.subject}">
-		                	<b><fmt:message key="label.delete"/></b>
-		                </html:link>
-	                </td>
-	            </tr>
-            </c:forEach>
-            </table>
-         </div>
-     </c:if>
-	</div>
+	<!-- Button Row -->
+	<tr>
+		<td colspan="2"><html:errors /></td>
+	</tr>
+	<tr>
+		<td colspan="2" class="formcontrol"><html:button property="cancel"
+			onclick="window.close()">
+			<fmt:message key="label.authoring.cancel.button" />
+		</html:button> <html:submit property="action">
+			<fmt:message key="label.authoring.save.button" />
+		</html:submit></td>
+	</tr>
+</table>
+
+</div>
Fisheye: Tag 0653e8df3351a6178f4dcb842f4eda25a3d2341b refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/forum/advanced.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0653e8df3351a6178f4dcb842f4eda25a3d2341b refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/forum/basic.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0653e8df3351a6178f4dcb842f4eda25a3d2341b refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/forum/editAdvanced.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0653e8df3351a6178f4dcb842f4eda25a3d2341b refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/forum/editBasic.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0653e8df3351a6178f4dcb842f4eda25a3d2341b refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/forum/editInstructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0653e8df3351a6178f4dcb842f4eda25a3d2341b refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/forum/includes/advanced.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0653e8df3351a6178f4dcb842f4eda25a3d2341b refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/forum/includes/basic.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0653e8df3351a6178f4dcb842f4eda25a3d2341b refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/forum/includes/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0653e8df3351a6178f4dcb842f4eda25a3d2341b refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/forum/instructions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
diff -u -r7c2b1a8f06af3cbdb52aa229c170fb80ec2022ad -r0653e8df3351a6178f4dcb842f4eda25a3d2341b
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision 7c2b1a8f06af3cbdb52aa229c170fb80ec2022ad)
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -1,13 +1,13 @@
 <%@ include file="/includes/taglibs.jsp" %>
-<%@ include file="/includes/messages.jsp" %>
 
 <html:errors property="error" />
 <html:javascript formName="messageForm" dynamicJavascript="true" staticJavascript="false"/>
 <div align="center">
 <html:form action="/authoring/forum/createTopic.do" focus="message.subject"
-	styleId="messageForm" onsubmit="return validateMessageForm(this);" >
+	onsubmit="return validateMessageForm(this);" >
 <fieldset>
-<%@ include file="includes/form.jsp" %>
+<%@ include file="/jsps/message/topiclist.jsp" %>
+<%@ include file="/jsps/message/form.jsp" %>
  </fieldset>
  </html:form>
 </div>
Fisheye: Tag 0653e8df3351a6178f4dcb842f4eda25a3d2341b refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/message/includes/form.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/message/form.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/message/form.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/message/form.jsp	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -0,0 +1,25 @@
+
+<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">&nbsp;&nbsp;<html:textarea rows="10" cols="60"
+			tabindex="2" property="message.body" /> <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="message.attachmentName" /> <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/message/topiclist.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/message/topiclist.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/message/topiclist.jsp	(revision 0653e8df3351a6178f4dcb842f4eda25a3d2341b)
@@ -0,0 +1,17 @@
+<div align="center">
+<table width="100%" cellspacing="8" align="CENTER" cellspacing="3" cellpadding="3" class="form">
+	<tr>
+		<td valign="MIDDLE"><b>Topic</b></td>
+		<td colspan="2" />
+	</tr>
+	<c:forEach items="${topicList}" var="topic">
+		<tr>
+			<td valign="MIDDLE"><c:out value="${topic.subject}" /></td>
+			<td colspan="2" valign="MIDDLE"><html:link
+				page="/authoring/forum/deleteTopic.do?topicName=${topic.subject}">
+				<b><fmt:message key="label.delete" /></b>
+			</html:link></td> 
+		</tr>
+	</c:forEach>
+</table>
+</div>