Index: lams_tool_forum/build.xml
===================================================================
diff -u -raaca44f485c3bacc6c866f7df28c0511061473d6 -rd21a020d917869e77f133713f28b8e6c70ad08d5
--- lams_tool_forum/build.xml	(.../build.xml)	(revision aaca44f485c3bacc6c866f7df28c0511061473d6)
+++ lams_tool_forum/build.xml	(.../build.xml)	(revision d21a020d917869e77f133713f28b8e6c70ad08d5)
@@ -246,7 +246,7 @@
 
 	</target>
 
-	<target name="build-war" depends="web,jar" description="creates war file">
+	<target name="build-war" depends="web" description="creates war file">
 		<echo>+------------------------------------------+</echo>
 		<echo>| build jar file                           |</echo>
 		<echo>+------------------------------------------+</echo>
@@ -259,6 +259,7 @@
 				<include name="struts/*"/>
 				<exclude name="web.xml"/>
 			</webinf>
+			<classes dir="${build.classes.java}"/>	
 			<fileset dir="${conf.web.dir}">
 				<include name="*"/>
 				<include name="includes/**"/>
@@ -374,5 +375,39 @@
 	</target>
 
  	<!-- end navigation tasks ***************************************************************************************-->
+	
+	<!-- Debug target: Explode tool to ear folder for debug use  -->
+	<target name="delete-exploded-tool-folder" description="delete old tool exploded tool folder">
+		<!-- delete old war folder tree -->
+		<delete quiet="true" includeemptydirs="true">
+			<fileset dir="${jboss.deploy}/${product}.war">
+			    <include name="**"/>
+			</fileset>
+		</delete>
+		<!-- if use explode tool target when jboss is running, explode may be failed and left the the temp folder. Here try to delete the temp folder -->
+		<delete quiet="true" includeemptydirs="true">
+			<fileset dir="${jboss.deploy}/temp-${product}.war">
+			    <include name="**"/>
+			</fileset>
+		</delete>
+	</target>
+	
+	<target name="explode-tool" depends="delete-exploded-tool-folder,deploy-tool" description="explode tool jar and war package to a war folder">
+		<!-- rename war file to avoid name conflict -->
+		<move tofile="${jboss.deploy}/temp-${product}.war" file="${jboss.deploy}/${product}.war"/>
+		<!-- explode the ear -->
+		<!-- Don't explode jar file, becuase classes in jar will conflict with those same classes files in war -->
+		<!--<unjar src="${jboss.deploy}/${product}.jar" dest="${jboss.deploy}/${product}.war" />-->
+		<unjar src="${jboss.deploy}/temp-${product}.war" dest="${jboss.deploy}/${product}.war" />
+		<!-- delete war and jar files -->
+		<delete>
+			<fileset dir="${jboss.deploy}">
+			    <include name="temp-${product}.war"/>
+			    <include name="${product}.jar"/>
+			</fileset>
+		</delete>
+	
+	</target>
+	
 	<!-- end tasks **************************************************************************************************-->
 </project>
Index: lams_tool_forum/db/sql/cleanup_lams_tool_forum.sql
===================================================================
diff -u -r8f714bc2a298cad42acd47e9c5df932b23555eb7 -rd21a020d917869e77f133713f28b8e6c70ad08d5
--- lams_tool_forum/db/sql/cleanup_lams_tool_forum.sql	(.../cleanup_lams_tool_forum.sql)	(revision 8f714bc2a298cad42acd47e9c5df932b23555eb7)
+++ lams_tool_forum/db/sql/cleanup_lams_tool_forum.sql	(.../cleanup_lams_tool_forum.sql)	(revision d21a020d917869e77f133713f28b8e6c70ad08d5)
@@ -1,5 +1,4 @@
 delete from tl_lafrum11_attachment;
 delete from tl_lafrum11_forum;
-delete from tl_lafrum11_genericentity;
 delete from tl_lafrum11_message;
 
Index: lams_tool_forum/db/sql/create_lams_tool_forum.sql
===================================================================
diff -u -r8f714bc2a298cad42acd47e9c5df932b23555eb7 -rd21a020d917869e77f133713f28b8e6c70ad08d5
--- lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision 8f714bc2a298cad42acd47e9c5df932b23555eb7)
+++ lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision d21a020d917869e77f133713f28b8e6c70ad08d5)
@@ -1,42 +1,39 @@
 create table tl_lafrum11_attachment (
-   id bigint not null,
-   UUID bigint,
+   UUID bigint not null auto_increment,
    VERSION bigint,
-   FORUM bigint,
-   primary key (id)
+   type varchar(255),
+   NAME varchar(255),
+   forum bigint,
+   primary key (UUID)
 );
 create table tl_lafrum11_forum (
-   id bigint not null,
+   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 (id)
+   primary key (UUID)
 );
-create table tl_lafrum11_genericentity (
-   ID bigint not null auto_increment,
+create table tl_lafrum11_message (
+   UUID bigint not null auto_increment,
    CREATED datetime,
    UPDATED datetime,
    CREATEDBY bigint,
    MODIFIEDBY bigint,
-   primary key (ID)
-);
-create table tl_lafrum11_message (
-   id bigint not null,
    SUBJECT varchar(255),
    BODY text,
    ISAUTHORED bit,
    ISANNONYMOUS bit,
    FORUM bigint,
-   PARENT bigint,
-   primary key (id)
+   parent bigint,
+   primary key (UUID)
 );
-alter table tl_lafrum11_attachment add index FK389AD9A23FF9501 (FORUM), add constraint FK389AD9A23FF9501 foreign key (FORUM) references tl_lafrum11_forum (id);
-alter table tl_lafrum11_attachment add index FK389AD9A2D1B (id), add constraint FK389AD9A2D1B foreign key (id) references tl_lafrum11_genericentity (ID);
-alter table tl_lafrum11_forum add index FK87917942D1B (id), add constraint FK87917942D1B foreign key (id) references tl_lafrum11_genericentity (ID);
-alter table tl_lafrum11_message add index FK4A6067E83FF9501 (FORUM), add constraint FK4A6067E83FF9501 foreign key (FORUM) references tl_lafrum11_forum (id);
-alter table tl_lafrum11_message add index FK4A6067E88C3DFCAA (PARENT), add constraint FK4A6067E88C3DFCAA foreign key (PARENT) references tl_lafrum11_message (id);
-alter table tl_lafrum11_message add index FK4A6067E8D1B (id), add constraint FK4A6067E8D1B foreign key (id) references tl_lafrum11_genericentity (ID);
+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);
Index: lams_tool_forum/db/sql/drop_lams_tool_forum.sql
===================================================================
diff -u -r4296cc24afab0a22b2075656b93b7bad7578e32f -rd21a020d917869e77f133713f28b8e6c70ad08d5
--- lams_tool_forum/db/sql/drop_lams_tool_forum.sql	(.../drop_lams_tool_forum.sql)	(revision 4296cc24afab0a22b2075656b93b7bad7578e32f)
+++ lams_tool_forum/db/sql/drop_lams_tool_forum.sql	(.../drop_lams_tool_forum.sql)	(revision d21a020d917869e77f133713f28b8e6c70ad08d5)
@@ -1,7 +1,6 @@
 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_genericentity;
 drop table if exists tl_lafrum11_message;
 SET FOREIGN_KEY_CHECKS=1;
 
Index: lams_tool_forum/db/sql/insert_lams_tool_forum_data.sql
===================================================================
diff -u -r8f714bc2a298cad42acd47e9c5df932b23555eb7 -rd21a020d917869e77f133713f28b8e6c70ad08d5
--- lams_tool_forum/db/sql/insert_lams_tool_forum_data.sql	(.../insert_lams_tool_forum_data.sql)	(revision 8f714bc2a298cad42acd47e9c5df932b23555eb7)
+++ lams_tool_forum/db/sql/insert_lams_tool_forum_data.sql	(.../insert_lams_tool_forum_data.sql)	(revision d21a020d917869e77f133713f28b8e6c70ad08d5)
@@ -1,9 +1,4 @@
-INSERT INTO tl_lafrum11_genericentity (ID, CREATED
-								) VALUES (1,
-		NOW());
-INSERT INTO tl_lafrum11_genericentity (ID, CREATED
-								) VALUES (2,
-		NOW());
 insert into tl_lafrum11_forum (ID,TITLE, ALLOWANNOMITY, FORCEOFFLINE, LOCKWHENFINISHED, INSTRUCTIONS,
 ONLINEINSTRUCTIONS, OFFLINEINSTRUCTIONS) VALUES (1, "TEST FORUM", false, false, false, "TEST INSTRUCTIONS", "TEST ONLINE INSTRUCTIONS", "TEST OFFLINE INSTRUCTIONS");
+
 insert into tl_lafrum11_message (ID, SUBJECT, BODY, ISAUTHORED, ISANNONYMOUS, FORUM, PARENT) VALUES  (2, "TITLE", "BODY", true, false, 1, NULL) ;
\ No newline at end of file
Index: lams_tool_forum/docs/requirement.txt
===================================================================
diff -u
--- lams_tool_forum/docs/requirement.txt	(revision 0)
+++ lams_tool_forum/docs/requirement.txt	(revision d21a020d917869e77f133713f28b8e6c70ad08d5)
@@ -0,0 +1,31 @@
+Author:
+1. Flag to allow student edit
+2. Flag on lock after finish
+3. Flag to switch Rich RTF/text area editor for student
+4. Add topic for forum, attach file for topic
+
+
+Monitor:
+1. Hide message in a topic
+
+
+Student:
+1. Topic page
+1.1 One line for each topic
+1.2 Latest top display on top
+1.3 Topic title, author, thread number, last reply date
+1.4 Finish function on top of page
+
+2. Thread page
+1.1 Thread display message
+1.2 Attachment file on the bottom of topic
+1.3 Edit(if allow), Replay function for each topic
+
+3. Post page
+3.1 Titile
+3.2 Content (Text area or Rich RTF editor)
+3.3 Attachment on the bottom and upload with post, only allow one attachment
+
+4. Others
+4.1 Student can edit topic title, content and attachment
+4.2 Sutdent can not delete/hide a message.
Index: lams_tool_forum/docs/scmhistory.txt
===================================================================
diff -u
--- lams_tool_forum/docs/scmhistory.txt	(revision 0)
+++ lams_tool_forum/docs/scmhistory.txt	(revision d21a020d917869e77f133713f28b8e6c70ad08d5)
@@ -0,0 +1 @@
+v1110200501   Before unpdate Conrad version.
Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/service/ForumManagerImplTest.java
===================================================================
diff -u -raaca44f485c3bacc6c866f7df28c0511061473d6 -rd21a020d917869e77f133713f28b8e6c70ad08d5
--- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/service/ForumManagerImplTest.java	(.../ForumManagerImplTest.java)	(revision aaca44f485c3bacc6c866f7df28c0511061473d6)
+++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/service/ForumManagerImplTest.java	(.../ForumManagerImplTest.java)	(revision d21a020d917869e77f133713f28b8e6c70ad08d5)
@@ -8,14 +8,13 @@
 
 import java.util.*;
 
+import junit.framework.Assert;
 import junit.framework.TestCase;
 
 /**
- * Created by IntelliJ IDEA.
  * User: conradb
  * Date: 9/06/2005
  * Time: 10:59:06
- * To change this template use File | Settings | File Templates.
  */
 public class ForumManagerImplTest extends TestCase {
     protected ForumManager forumManager;
@@ -47,7 +46,7 @@
 
         forumManager.deleteForum(forum.getUuid());
         try {
-            forumManager.getForum(forum.getUuid());
+            Forum forum2 = forumManager.getForum(forum.getUuid());
             fail("getForum should have barfed for non existing forum");
         } catch (Exception e) {
 
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -raaca44f485c3bacc6c866f7df28c0511061473d6 -rd21a020d917869e77f133713f28b8e6c70ad08d5
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision aaca44f485c3bacc6c866f7df28c0511061473d6)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision d21a020d917869e77f133713f28b8e6c70ad08d5)
@@ -13,6 +13,15 @@
   <!-- ========== Form Bean Definitions =================================== -->
   <form-beans>
 
+    <form-bean
+      name="forumForm"
+      type="org.lamsfoundation.lams.tool.forum.web.forms.ForumForm"
+    />
+    <form-bean
+      name="messageForm"
+      type="org.lamsfoundation.lams.tool.forum.web.forms.MessageForm"
+    />
+
   </form-beans>
 
   <!-- ========== Global Exceptions Definitions =================================== -->