Index: lams_tool_forum/build.properties
===================================================================
diff -u -r1b4b0ba0016c57080f14800d05aebf1f75912590 -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224
--- lams_tool_forum/build.properties	(.../build.properties)	(revision 1b4b0ba0016c57080f14800d05aebf1f75912590)
+++ lams_tool_forum/build.properties	(.../build.properties)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -9,7 +9,7 @@
 ### project properties ###
 signature=lafrum11
 project.displayname = lams forum tool
-tool.version=20080220
+tool.version=20081022
 
 # hide tool option
 hideTool=false
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml
===================================================================
diff -u -ra01292ae06e058ffcc16aaeec6d61959a7b69273 -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -260,6 +260,24 @@
             column="mark_release_notify"
         />
 
+        <set
+            name="conditions"
+            lazy="true"
+            cascade="all"
+            sort="org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator"
+        >
+
+            <key
+                column="content_uid"
+            >
+            </key>
+
+            <one-to-many
+                  class="org.lamsfoundation.lams.tool.forum.persistence.ForumCondition"
+            />
+
+        </set>
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Forum.xml
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml
===================================================================
diff -u
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml	(revision 0)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
+    
+<hibernate-mapping>
+	<joined-subclass 
+	    name="org.lamsfoundation.lams.tool.forum.persistence.ForumCondition" 
+	    table="tl_lafrum11_conditions"
+	    extends="org.lamsfoundation.lams.learningdesign.TextSearchCondition"
+	    lazy="false"
+	>
+	
+		<key column="condition_id" />
+	
+	    <set
+	            name="topics"
+	            table="tl_lafrum11_condition_topics"
+	            lazy="false"
+	            inverse="false"
+	            cascade="save-update"
+	            sort="unsorted"
+	            order-by="topic_uid asc"
+	            
+	     >
+	
+	            <key
+	                column="condition_id"
+	            >
+	            </key>
+	
+	            <many-to-many
+	                class="org.lamsfoundation.lams.tool.forum.persistence.Message"
+	                column="topic_uid"
+	             />
+	
+	    </set>
+	
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
Index: lams_tool_forum/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rd9b40ae8f10ecd605a07f0217112f62a26fa6e58 -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224
--- lams_tool_forum/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision d9b40ae8f10ecd605a07f0217112f62a26fa6e58)
+++ lams_tool_forum/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -117,6 +117,7 @@
 label.cancel  =Cancel
 authoring.tab.basic  =Basic
 authoring.tab.advanced  =Advanced
+authoring.tab.conditions  =Conditions
 page.title.authoring.init  =Forum Authoring
 label.yes  =Yes
 label.no  =No
@@ -191,4 +192,28 @@
 event.mark.release.mark  =For the message titled "{0}" posted on {1} the mark is {2}. \n
 
 
+label.authoring.heading.conditions.desc  =Please enter conditions for Forum
+label.authoring.heading.conditions  =Conditions
+label.authoring.conditions.add.condition  =Add condition
+label.authoring.conditions.list.title  =Conditions
+label.authoring.conditions.order  =Order
+label.authoring.conditions.empty.condition.list  =There are no conditions
+label.authoring.conditions.condition.name  =Name
+label.authoring.up =Up
+label.authoring.down =Down
+
+error.condition.name.blank  =Condition name can not be blank.
+error.condition.duplicated.name  =Duplicated name. Please choose unique one.
+error.condition.no.questions.selected  =There are no questions selected. Please select at least one.
+error.condition =Error creating condition.
+
+output.desc.text.search.output.definition.forum =Posts contain certain words
+text.search.output.definition.forum.default.condition =Posts to the first topic contain word "LAMS"
+
+textsearch.heading =Posts that...
+textsearch.all.words =have all these words:
+textsearch.phrase =have this exact wording or phrase:
+textsearch.any.words =have one or more of these words:
+textsearch.excluded.words =have none of these unwanted words:
+textsearch.topics =Search in these topics:
 #======= End labels: Exported 183 labels for en AU =====
Index: lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rd9b40ae8f10ecd605a07f0217112f62a26fa6e58 -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224
--- lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision d9b40ae8f10ecd605a07f0217112f62a26fa6e58)
+++ lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -142,6 +142,7 @@
 label.authoring.advance.use.richeditor  =Allow learners to use rich text editor
 label.authoring.heading.instructions.desc  =Please input online and offline instructions
 authoring.tab.instructions  =Instructions
+authoring.tab.conditions  =Conditions
 label.authoring.advance.maximum.reply  =Maximum:
 button.release.mark  =Release marks
 label.authoring.advance.no.minimum  =No minimum
@@ -191,4 +192,28 @@
 event.mark.release.mark  =For the message titled "{0}" posted on {1} the mark is {2}. \n
 
 
+label.authoring.heading.conditions.desc  =Please enter conditions for Forum
+label.authoring.heading.conditions  =Conditions
+label.authoring.conditions.add.condition  =Add condition
+label.authoring.conditions.list.title  =Conditions
+label.authoring.conditions.order  =Order
+label.authoring.conditions.empty.condition.list  =There are no conditions
+label.authoring.conditions.condition.name  =Name
+label.authoring.up =Up
+label.authoring.down =Down
+
+error.condition.name.blank  =Condition name can not be blank.
+error.condition.duplicated.name  =Duplicated name. Please choose unique one.
+error.condition.no.questions.selected  =There are no questions selected. Please select at least one.
+error.condition =Error creating condition.
+
+output.desc.text.search.output.definition.forum =Posts contain certain words
+text.search.output.definition.forum.default.condition =Posts to the first topic contain word "LAMS"
+
+textsearch.heading =Posts that...
+textsearch.all.words =have all these words:
+textsearch.phrase =have this exact wording or phrase:
+textsearch.any.words =have one or more of these words:
+textsearch.excluded.words =have none of these unwanted words:
+textsearch.topics =Search in these topics:
 #======= End labels: Exported 183 labels for en AU =====
Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -rdba3e6022ca1e0478e053c415095b14db37576c7 -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision dba3e6022ca1e0478e053c415095b14db37576c7)
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -125,7 +125,47 @@
 			<forward name="success" path="/jsps/authoring/message/topiclist.jsp" />
 		</action>
 
-
+		<!-- ==========  Survey Conditions  ========== -->
+		<action path="/authoring/newConditionInit"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringConditionAction"
+			name="forumConditionForm" 
+			scope="request" 
+			validate="false"			
+			parameter="newConditionInit">
+			<forward name="addcondition" path="/jsps/authoring/addCondition.jsp" />
+		</action>
+		<action path="/authoring/editCondition"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringConditionAction"
+			name="forumConditionForm" 
+			scope="request" 
+			parameter="editCondition" 
+			validate="false">
+			<forward name="addcondition" path="/jsps/authoring/addCondition.jsp" />
+		</action>
+		<action path="/authoring/saveOrUpdateCondition"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringConditionAction"
+			parameter="saveOrUpdateCondition"
+			name="forumConditionForm" 
+			scope="request" 
+			validate="false">
+			<forward name="addcondition" path="/jsps/authoring/addCondition.jsp" />
+			<forward name="success" path="/jsps/authoring/conditionList.jsp" />
+		</action>
+		<action path="/authoring/removeCondition"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringConditionAction"
+			parameter="removeCondition">
+			<forward name="success" path="/jsps/authoring/conditionList.jsp" />
+		</action>
+		<action path="/authoring/upCondition"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringConditionAction"
+			parameter="upCondition">
+			<forward name="success" path="/jsps/authoring/conditionList.jsp" />
+		</action>
+		<action path="/authoring/downCondition"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringConditionAction"
+			parameter="downCondition">
+			<forward name="success" path="/jsps/authoring/conditionList.jsp" />
+		</action>
 		
 		<!-- ========== END: Authroing Definitions ============================== -->
 		
Index: lams_tool_forum/db/model/forum.clay
===================================================================
diff -u -ra01292ae06e058ffcc16aaeec6d61959a7b69273 -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224
--- lams_tool_forum/db/model/forum.clay	(.../forum.clay)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
+++ lams_tool_forum/db/model/forum.clay	(.../forum.clay)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -6,7 +6,123 @@
 <schema alias="" name="LAMS" remarks="" uid="3c59d3:1182f36109d:-7fff">
 <schema-description/>
 <domain-list/>
-<table-list/>
+<table-list>
+<table alias="" name="tl_lafrum11_condition_topics" remarks="" uid="a5032e:11d2755344e:-7ff0">
+<table-description/>
+<table-figure-bounds height="-1" width="-1" x="104" y="653"/>
+<column-list>
+<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="condition_id" remarks="" uid="a5032e:11d2755344e:-7fee">
+<column-description/>
+<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT(%n)">
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
+<variant type-name-pattern="BIGINT"/>
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
+<variant type-name-pattern="BIGINT UNSIGNED"/>
+<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="BIGINT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="topic_uid" remarks="" uid="a5032e:11d2755344e:-7fed">
+<column-description/>
+<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT(%n)">
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
+<variant type-name-pattern="BIGINT"/>
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
+<variant type-name-pattern="BIGINT UNSIGNED"/>
+<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="BIGINT ZEROFILL"/>
+</data-type>
+</column>
+</column-list>
+<primary-key alias="" name="PK_TL_LAFRUM11_CONDITION_TOPICS" remarks="" uid="a5032e:11d2755344e:-7fec">
+<primary-key-description/>
+<primary-key-column name="condition_id"/>
+<primary-key-column name="topic_uid"/>
+</primary-key>
+<unique-key-list/>
+<foreign-key-list>
+<foreign-key alias="" name="FK_tl_lafrum11_condition_topics_1" on-delete="" on-update="" referenced-key="PK_TL_LAFRUM11_CONDITIONS" referenced-table="tl_lafrum11_conditions" referenced-table-schema="LAMS" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="a5032e:11d2755344e:-7f5f">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="condition_id" referenced-key-column-name="condition_id"/>
+</foreign-key>
+<foreign-key alias="" name="FK_tl_lafrum11_condition_topics_2" on-delete="" on-update="" referenced-key="PRIMARY" referenced-table="tl_lafrum11_message" referenced-table-schema="DEFAULT_SCHEMA" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="a5032e:11d2755344e:-7f00">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="topic_uid" referenced-key-column-name="uid"/>
+</foreign-key>
+</foreign-key-list>
+<index-list/>
+</table>
+<table alias="" name="tl_lafrum11_conditions" remarks="" uid="a5032e:11d2755344e:-7feb">
+<table-description/>
+<table-figure-bounds height="50" width="131" x="-73" y="408"/>
+<column-list>
+<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="condition_id" remarks="" uid="a5032e:11d2755344e:-7fe9">
+<column-description/>
+<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT(%n)">
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
+<variant type-name-pattern="BIGINT"/>
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
+<variant type-name-pattern="BIGINT UNSIGNED"/>
+<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="BIGINT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="content_uid" remarks="" uid="a5032e:11d2755344e:-7fe8">
+<column-description/>
+<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT(%n)">
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
+<variant type-name-pattern="BIGINT"/>
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
+<variant type-name-pattern="BIGINT UNSIGNED"/>
+<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="BIGINT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="" uid="a5032e:11d2755344e:-7fc4">
+<column-description/>
+<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT(%n)">
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
+<variant type-name-pattern="BIGINT"/>
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
+<variant type-name-pattern="BIGINT UNSIGNED"/>
+<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="BIGINT ZEROFILL"/>
+</data-type>
+</column>
+</column-list>
+<primary-key alias="" name="PK_TL_LAFRUM11_CONDITIONS" remarks="" uid="a5032e:11d2755344e:-7fe7">
+<primary-key-description/>
+<primary-key-column name="condition_id"/>
+</primary-key>
+<unique-key-list/>
+<foreign-key-list>
+<foreign-key alias="" name="FK_tl_lafrum11_conditions_1" on-delete="" on-update="" referenced-key="PRIMARY" referenced-table="tl_lafrum11_forum" referenced-table-schema="DEFAULT_SCHEMA" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="a5032e:11d2755344e:-7fc5">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="condition_id" referenced-key-column-name="uid"/>
+</foreign-key>
+</foreign-key-list>
+<index-list/>
+</table>
+</table-list>
 </schema>
 <schema alias="" name="DEFAULT_SCHEMA" remarks="" uid="3c59d3:1182f36109d:-7ffe">
 <schema-description/>
@@ -124,7 +240,7 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7ff3" unique="false">
+<index alias="" name="PRIMARY_ATTACHMENT" remarks="" uid="3c59d3:1182f36109d:-7ff3" unique="false">
 <index-description/>
 <index-column name="uid" sort="ASC"/>
 </index>
@@ -330,7 +446,7 @@
 <unique-key-list/>
 <foreign-key-list/>
 <index-list>
-<index alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fde" unique="false">
+<index alias="" name="PRIMARY_FORUM" remarks="" uid="3c59d3:1182f36109d:-7fde" unique="false">
 <index-description/>
 <index-column name="uid" sort="ASC"/>
 </index>
@@ -413,7 +529,7 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fd5" unique="false">
+<index alias="" name="PRIMARY_USER" remarks="" uid="3c59d3:1182f36109d:-7fd5" unique="false">
 <index-description/>
 <index-column name="uid" sort="ASC"/>
 </index>
@@ -665,7 +781,7 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fc1" unique="false">
+<index alias="" name="PRIMARY_MESSAGE" remarks="" uid="3c59d3:1182f36109d:-7fc1" unique="false">
 <index-description/>
 <index-column name="uid" sort="ASC"/>
 </index>
@@ -778,7 +894,7 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fb4" unique="false">
+<index alias="" name="PRIMARY_MESSAGE_SEQ" remarks="" uid="3c59d3:1182f36109d:-7fb4" unique="false">
 <index-description/>
 <index-column name="uid" sort="ASC"/>
 </index>
@@ -842,7 +958,7 @@
 <unique-key-list/>
 <foreign-key-list/>
 <index-list>
-<index alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fab" unique="false">
+<index alias="" name="PRIMARY_REPORT" remarks="" uid="3c59d3:1182f36109d:-7fab" unique="false">
 <index-description/>
 <index-column name="uid" sort="ASC"/>
 </index>
@@ -939,7 +1055,7 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fa1" unique="false">
+<index alias="" name="PRIMARY_SESSION" remarks="" uid="3c59d3:1182f36109d:-7fa1" unique="false">
 <index-description/>
 <index-column name="uid" sort="ASC"/>
 </index>
Index: lams_tool_forum/db/sql/create_lams_tool_forum.sql
===================================================================
diff -u -ra01292ae06e058ffcc16aaeec6d61959a7b69273 -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224
--- lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
+++ lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -103,6 +103,27 @@
    session_name varchar(250),
    primary key (uid)
 )TYPE=InnoDB;
+
+CREATE TABLE tl_lafrum11_conditions (
+       condition_id BIGINT(20) NOT NULL
+	 , content_uid BIGINT(20)
+     , PRIMARY KEY (condition_id)
+	 , CONSTRAINT ForumConditionInheritance FOREIGN KEY (condition_id)
+                  REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE
+	 , CONSTRAINT ForumConditionToForum FOREIGN KEY (content_uid)
+                  REFERENCES tl_lafrum11_forum(uid) ON DELETE CASCADE ON UPDATE CASCADE
+)TYPE=InnoDB;
+
+CREATE TABLE tl_lafrum11_condition_topics (
+ 	   condition_id BIGINT(20)
+ 	 , topic_uid BIGINT(20)
+ 	 , PRIMARY KEY (condition_id,topic_uid)
+	 , CONSTRAINT ForumConditionQuestionToForumCondition FOREIGN KEY (condition_id)
+                  REFERENCES tl_lafrum11_conditions(condition_id) ON DELETE CASCADE ON UPDATE CASCADE
+	 , CONSTRAINT ForumConditionQuestionToForumQuestion FOREIGN KEY (topic_uid)
+                  REFERENCES tl_lafrum11_message(uid) ON DELETE CASCADE ON UPDATE CASCADE	
+)TYPE=InnoDB;
+
 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_forum add index FK87917942E42F4351 (create_by), add constraint FK87917942E42F4351 foreign key (create_by) references tl_lafrum11_forum_user (uid);
Index: lams_tool_forum/db/sql/drop_lams_tool_forum.sql
===================================================================
diff -u -rac0c4f506511cfd628fc56582b17c934425db055 -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224
--- lams_tool_forum/db/sql/drop_lams_tool_forum.sql	(.../drop_lams_tool_forum.sql)	(revision ac0c4f506511cfd628fc56582b17c934425db055)
+++ lams_tool_forum/db/sql/drop_lams_tool_forum.sql	(.../drop_lams_tool_forum.sql)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -8,6 +8,8 @@
 drop table if exists tl_lafrum11_message_seq;
 drop table if exists tl_lafrum11_tool_session;
 drop table if exists tl_lafrum11_report;
+drop table if exists tl_lafrum11_condition_topics;
+drop table if exists tl_lafrum11_conditions;
 SET FOREIGN_KEY_CHECKS=1;
 
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20081022_updateFrom21.sql
===================================================================
diff -u
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20081022_updateFrom21.sql	(revision 0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20081022_updateFrom21.sql	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -0,0 +1,21 @@
+-- SQL statements to update from LAMS 2.1/2.1.1
+
+CREATE TABLE tl_lafrum11_conditions (
+       condition_id BIGINT(20) NOT NULL
+	 , content_uid BIGINT(20)
+     , PRIMARY KEY (condition_id)
+	 , CONSTRAINT ForumConditionInheritance FOREIGN KEY (condition_id)
+                  REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE
+	 , CONSTRAINT ForumConditionToForum FOREIGN KEY (content_uid)
+                  REFERENCES tl_lafrum11_forum(uid) ON DELETE CASCADE ON UPDATE CASCADE
+)TYPE=InnoDB;
+
+CREATE TABLE tl_lafrum11_condition_topics (
+ 	   condition_id BIGINT(20)
+ 	 , topic_uid BIGINT(20)
+ 	 , PRIMARY KEY (condition_id,topic_uid)
+	 , CONSTRAINT ForumConditionQuestionToForumCondition FOREIGN KEY (condition_id)
+                  REFERENCES tl_lafrum11_conditions(condition_id) ON DELETE CASCADE ON UPDATE CASCADE
+	 , CONSTRAINT ForumConditionQuestionToForumQuestion FOREIGN KEY (topic_uid)
+                  REFERENCES tl_lafrum11_message(uid) ON DELETE CASCADE ON UPDATE CASCADE	
+)TYPE=InnoDB;
\ No newline at end of file
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
===================================================================
diff -u -ra01292ae06e058ffcc16aaeec6d61959a7b69273 -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -16,13 +16,15 @@
         <!-- Must references all OR mapping files. -->
         <property name="mappingResources">
             <list>
+               <value>org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml</value>
                <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/ForumReport.hbm.xml</value>
                <value>org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml</value>
                <value>org/lamsfoundation/lams/tool/forum/persistence/MessageSeq.hbm.xml</value>
+               <value>org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml</value>
             </list>
         </property>
     </bean>
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml
===================================================================
diff -u -ra01292ae06e058ffcc16aaeec6d61959a7b69273 -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -260,6 +260,24 @@
             column="mark_release_notify"
         />
 
+        <set
+            name="conditions"
+            lazy="true"
+            cascade="all"
+            sort="org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator"
+        >
+
+            <key
+                column="content_uid"
+            >
+            </key>
+
+            <one-to-many
+                  class="org.lamsfoundation.lams.tool.forum.persistence.ForumCondition"
+            />
+
+        </set>
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Forum.xml
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java
===================================================================
diff -u -ra01292ae06e058ffcc16aaeec6d61959a7b69273 -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	(.../Forum.java)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	(.../Forum.java)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -28,582 +28,596 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
+import java.util.TreeSet;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
 import org.lamsfoundation.lams.tool.forum.util.ForumToolContentHandler;
 
 /**
  * Forum
+ * 
  * @author conradb
- *
- * @hibernate.class  table="tl_lafrum11_forum"
- *
+ * 
+ * @hibernate.class table="tl_lafrum11_forum"
+ * 
  */
 public class Forum implements Cloneable {
 
-	private static final Logger log = Logger.getLogger(Forum.class);
+    private static final Logger log = Logger.getLogger(Forum.class);
 
-	//key 
-	private Long uid;
+    // key
+    private Long uid;
 
-	//tool contentID
-	private Long contentId;
+    // tool contentID
+    private Long contentId;
 
-	private String title;
+    private String title;
 
-	private boolean lockWhenFinished;
+    private boolean lockWhenFinished;
 
-	private boolean runOffline;
+    private boolean runOffline;
 
-	private boolean allowAnonym;
+    private boolean allowAnonym;
 
-	private boolean allowEdit;
+    private boolean allowEdit;
 
-	private boolean allowNewTopic;
+    private boolean allowNewTopic;
 
-	private boolean allowUpload;
+    private boolean allowUpload;
 
-	private int maximumReply;
+    private int maximumReply;
 
-	private int minimumReply;
+    private int minimumReply;
 
-	private boolean allowRichEditor;
+    private boolean allowRichEditor;
 
-	private String instructions;
+    private String instructions;
 
-	private String onlineInstructions;
+    private String onlineInstructions;
 
-	private String offlineInstructions;
+    private String offlineInstructions;
 
-	private boolean defineLater;
+    private boolean defineLater;
 
-	private boolean contentInUse;
+    private boolean contentInUse;
 
-	private Date created;
+    private Date created;
 
-	private Date updated;
+    private Date updated;
 
-	private ForumUser createdBy;
+    private ForumUser createdBy;
 
-	private Set messages;
+    private Set messages;
 
-	private Set attachments;
+    private Set attachments;
 
-	private int limitedChar;
+    private int limitedChar;
 
-	private boolean limitedInput;
+    private boolean limitedInput;
 
-	private boolean reflectOnActivity;
+    private boolean reflectOnActivity;
 
-	private String reflectInstructions;
+    private String reflectInstructions;
 
-	private boolean notifyLearnersOnMarkRelease;
+    private boolean notifyLearnersOnMarkRelease;
 
-	//********* Non Persist fields
-	private ForumToolContentHandler toolContentHandler;
+    // conditions
+    private Set<ForumCondition> conditions = new TreeSet<ForumCondition>(new TextSearchConditionComparator());
 
-	/**
-	 * Default contruction method. 
-	 *
-	 */
-	public Forum() {
-		attachments = new HashSet();
-		messages = new HashSet();
-	}
+    // ********* Non Persist fields
+    private ForumToolContentHandler toolContentHandler;
 
-	//  **********************************************************
-	//		Function method for Forum
-	//  **********************************************************
-	@Override
-	public Object clone() {
+    /**
+     * Default contruction method.
+     * 
+     */
+    public Forum() {
+	attachments = new HashSet();
+	messages = new HashSet();
+    }
 
-		Forum forum = null;
-		try {
-			forum = (Forum) super.clone();
-			forum.setUid(null);
-			//clone message
-			if (messages != null) {
-				Iterator iter = messages.iterator();
-				Set set = new HashSet();
-				while (iter.hasNext()) {
-					set.add(Message.newInstance((Message) iter.next(), toolContentHandler));
-				}
-				forum.messages = set;
-			}
-			//clone attachment
-			if (attachments != null) {
-				Iterator iter = attachments.iterator();
-				Set set = new HashSet();
-				while (iter.hasNext()) {
-					Attachment file = (Attachment) iter.next();
-					Attachment newFile = (Attachment) file.clone();
-					//clone old file without duplicate it in repository
+    // **********************************************************
+    // Function method for Forum
+    // **********************************************************
+    @Override
+    public Object clone() {
 
-					set.add(newFile);
-				}
-				forum.attachments = set;
-			}
+	Forum forum = null;
+	try {
+	    forum = (Forum) super.clone();
+	    forum.setUid(null);
+	    // clone message
+	    if (messages != null) {
+		Iterator iter = messages.iterator();
+		Set set = new HashSet();
+		while (iter.hasNext()) {
+		    set.add(Message.newInstance((Message) iter.next(), toolContentHandler));
 		}
-		catch (CloneNotSupportedException e) {
-			Forum.log.error("When clone " + Forum.class + " failed");
+		forum.messages = set;
+	    }
+	    if (getConditions() != null) {
+		Set<ForumCondition> conditionsCopy = new TreeSet<ForumCondition>(new TextSearchConditionComparator());
+		for (ForumCondition condition : getConditions()) {
+		    conditionsCopy.add(condition.clone(forum));
 		}
+		forum.setConditions(conditionsCopy);
+	    }
+	    // clone attachment
+	    if (attachments != null) {
+		Iterator iter = attachments.iterator();
+		Set set = new HashSet();
+		while (iter.hasNext()) {
+		    Attachment file = (Attachment) iter.next();
+		    Attachment newFile = (Attachment) file.clone();
+		    // clone old file without duplicate it in repository
 
-		return forum;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o) {
-			return true;
+		    set.add(newFile);
 		}
-		if (!(o instanceof Forum)) {
-			return false;
-		}
+		forum.attachments = set;
+	    }
 
-		final Forum genericEntity = (Forum) o;
-
-		return new EqualsBuilder().append(uid, genericEntity.uid).append(title, genericEntity.title).append(instructions,
-				genericEntity.instructions).append(onlineInstructions, genericEntity.onlineInstructions).append(
-				offlineInstructions, genericEntity.offlineInstructions).append(created, genericEntity.created).append(updated,
-				genericEntity.updated).append(createdBy, genericEntity.createdBy).isEquals();
+	} catch (CloneNotSupportedException e) {
+	    Forum.log.error("When clone " + Forum.class + " failed");
 	}
 
-	@Override
-	public int hashCode() {
-		return new HashCodeBuilder().append(uid).append(title).append(instructions).append(onlineInstructions).append(
-				offlineInstructions).append(created).append(updated).append(createdBy).toHashCode();
-	}
+	return forum;
+    }
 
-	//**********************************************************
-	// get/set methods
-	//**********************************************************
-	/**
-	 * Returns the object's creation date
-	 *
-	 * @return date
-	 * @hibernate.property column="create_date"
-	 */
-	public Date getCreated() {
-		return created;
+    @Override
+    public boolean equals(Object o) {
+	if (this == o) {
+	    return true;
 	}
-
-	/**
-	 * Sets the object's creation date
-	 *
-	 * @param created
-	 */
-	public void setCreated(Date created) {
-		this.created = created;
+	if (!(o instanceof Forum)) {
+	    return false;
 	}
 
-	/**
-	 * Returns the object's date of last update
-	 *
-	 * @return date updated
-	 * @hibernate.property column="update_date"
-	 */
-	public Date getUpdated() {
-		return updated;
-	}
+	final Forum genericEntity = (Forum) o;
 
-	/**
-	 * Sets the object's date of last update
-	 *
-	 * @param updated
-	 */
-	public void setUpdated(Date updated) {
-		this.updated = updated;
-	}
+	return new EqualsBuilder().append(uid, genericEntity.uid).append(title, genericEntity.title).append(
+		instructions, genericEntity.instructions).append(onlineInstructions, genericEntity.onlineInstructions)
+		.append(offlineInstructions, genericEntity.offlineInstructions).append(created, genericEntity.created)
+		.append(updated, genericEntity.updated).append(createdBy, genericEntity.createdBy).isEquals();
+    }
 
-	/**
-	 * @return Returns the userid of the user who created the Forum.
-	 *
-	 * @hibernate.many-to-one
-	 *      cascade="none"
-	 * 		column="create_by"
-	 *
-	 */
-	public ForumUser getCreatedBy() {
-		return createdBy;
-	}
+    @Override
+    public int hashCode() {
+	return new HashCodeBuilder().append(uid).append(title).append(instructions).append(onlineInstructions).append(
+		offlineInstructions).append(created).append(updated).append(createdBy).toHashCode();
+    }
 
-	/**
-	 * @param createdBy The userid of the user who created this Forum.
-	 */
-	public void setCreatedBy(ForumUser createdBy) {
-		this.createdBy = createdBy;
-	}
+    // **********************************************************
+    // get/set methods
+    // **********************************************************
+    /**
+     * Returns the object's creation date
+     * 
+     * @return date
+     * @hibernate.property column="create_date"
+     */
+    public Date getCreated() {
+	return created;
+    }
 
-	/**
-	 * @hibernate.id column="uid" generator-class="native"
-	 */
-	public Long getUid() {
-		return uid;
-	}
+    /**
+     * Sets the object's creation date
+     * 
+     * @param created
+     */
+    public void setCreated(Date created) {
+	this.created = created;
+    }
 
-	public void setUid(Long uid) {
-		this.uid = uid;
-	}
+    /**
+     * Returns the object's date of last update
+     * 
+     * @return date updated
+     * @hibernate.property column="update_date"
+     */
+    public Date getUpdated() {
+	return updated;
+    }
 
-	/**
-	 * @return Returns the title.
-	 *
-	 * @hibernate.property
-	 * 		column="title"
-	 *
-	 */
-	public String getTitle() {
-		return title;
-	}
+    /**
+     * Sets the object's date of last update
+     * 
+     * @param updated
+     */
+    public void setUpdated(Date updated) {
+	this.updated = updated;
+    }
 
-	/**
-	 * @param title The title to set.
-	 */
-	public void setTitle(String title) {
-		this.title = title;
-	}
+    /**
+     * @return Returns the userid of the user who created the Forum.
+     * 
+     * @hibernate.many-to-one cascade="none" column="create_by"
+     * 
+     */
+    public ForumUser getCreatedBy() {
+	return createdBy;
+    }
 
-	/**
-	 * @return Returns the allowAnonym.
-	 *
-	 * @hibernate.property 
-	 * 		column="allow_anonym"
-	 *  
-	 */
-	public boolean getAllowAnonym() {
-		return allowAnonym;
-	}
+    /**
+     * @param createdBy
+     *                The userid of the user who created this Forum.
+     */
+    public void setCreatedBy(ForumUser createdBy) {
+	this.createdBy = createdBy;
+    }
 
-	/**
-	 * @param allowAnonym The allowAnonym to set.
-	 *
-	 */
-	public void setAllowAnonym(boolean allowAnnomity) {
-		allowAnonym = allowAnnomity;
-	}
+    /**
+     * @hibernate.id column="uid" generator-class="native"
+     */
+    public Long getUid() {
+	return uid;
+    }
 
-	/**
-	 * @return Returns the runOffline.
-	 *
-	 * @hibernate.property 
-	 * 		column="run_offline"
-	 *
-	 */
-	public boolean getRunOffline() {
-		return runOffline;
-	}
+    public void setUid(Long uid) {
+	this.uid = uid;
+    }
 
-	/**
-	 * @param runOffline The forceOffLine to set.
-	 *
-	 *
-	 */
-	public void setRunOffline(boolean forceOffline) {
-		runOffline = forceOffline;
-	}
+    /**
+     * @return Returns the title.
+     * 
+     * @hibernate.property column="title"
+     * 
+     */
+    public String getTitle() {
+	return title;
+    }
 
-	/**
-	 * @return Returns the lockWhenFinish.
-	 *
-	 * @hibernate.property
-	 * 		column="lock_on_finished"
-	 *
-	 */
-	public boolean getLockWhenFinished() {
-		return lockWhenFinished;
-	}
+    /**
+     * @param title
+     *                The title to set.
+     */
+    public void setTitle(String title) {
+	this.title = title;
+    }
 
-	/**
-	 * @param lockWhenFinished Set to true to lock the forum for finished users.
-	 */
-	public void setLockWhenFinished(boolean lockWhenFinished) {
-		this.lockWhenFinished = lockWhenFinished;
-	}
+    /**
+     * @return Returns the allowAnonym.
+     * 
+     * @hibernate.property column="allow_anonym"
+     * 
+     */
+    public boolean getAllowAnonym() {
+	return allowAnonym;
+    }
 
-	/**
-	 * @return Returns the instructions set by the teacher.
-	 *
-	 * @hibernate.property
-	 * 		column="instructions"
-	 *      type="text"
-	 */
-	public String getInstructions() {
-		return instructions;
-	}
+    /**
+     * @param allowAnonym
+     *                The allowAnonym to set.
+     * 
+     */
+    public void setAllowAnonym(boolean allowAnnomity) {
+	allowAnonym = allowAnnomity;
+    }
 
-	public void setInstructions(String instructions) {
-		this.instructions = instructions;
-	}
+    /**
+     * @return Returns the runOffline.
+     * 
+     * @hibernate.property column="run_offline"
+     * 
+     */
+    public boolean getRunOffline() {
+	return runOffline;
+    }
 
-	/**
-	 * @return Returns the onlineInstructions set by the teacher.
-	 *
-	 * @hibernate.property
-	 * 		column="online_instructions"
-	 *      type="text"
-	 */
-	public String getOnlineInstructions() {
-		return onlineInstructions;
-	}
+    /**
+     * @param runOffline
+     *                The forceOffLine to set.
+     * 
+     * 
+     */
+    public void setRunOffline(boolean forceOffline) {
+	runOffline = forceOffline;
+    }
 
-	public void setOnlineInstructions(String onlineInstructions) {
-		this.onlineInstructions = onlineInstructions;
-	}
+    /**
+     * @return Returns the lockWhenFinish.
+     * 
+     * @hibernate.property column="lock_on_finished"
+     * 
+     */
+    public boolean getLockWhenFinished() {
+	return lockWhenFinished;
+    }
 
-	/**
-	 * @return Returns the onlineInstructions set by the teacher.
-	 *
-	 * @hibernate.property
-	 * 		column="offline_instructions"
-	 *      type="text"
-	 */
-	public String getOfflineInstructions() {
-		return offlineInstructions;
-	}
+    /**
+     * @param lockWhenFinished
+     *                Set to true to lock the forum for finished users.
+     */
+    public void setLockWhenFinished(boolean lockWhenFinished) {
+	this.lockWhenFinished = lockWhenFinished;
+    }
 
-	public void setOfflineInstructions(String offlineInstructions) {
-		this.offlineInstructions = offlineInstructions;
-	}
+    /**
+     * @return Returns the instructions set by the teacher.
+     * 
+     * @hibernate.property column="instructions" type="text"
+     */
+    public String getInstructions() {
+	return instructions;
+    }
 
-	/**
-	 *
-	 * @hibernate.set   lazy="true"
-	 * 					cascade="all"
-	 * 					inverse="false"
-	 * 					order-by="create_date desc"
-	 * @hibernate.collection-key column="forum_uid"
-	 * @hibernate.collection-one-to-many
-	 * 			class="org.lamsfoundation.lams.tool.forum.persistence.Attachment"
-	 *
-	 * @return a set of Attachments to this Message.
-	 */
-	public Set getAttachments() {
-		return attachments;
-	}
+    public void setInstructions(String instructions) {
+	this.instructions = instructions;
+    }
 
-	/*
-	 * @param attachments The attachments to set.
-	 */
-	public void setAttachments(Set attachments) {
-		this.attachments = attachments;
-	}
+    /**
+     * @return Returns the onlineInstructions set by the teacher.
+     * 
+     * @hibernate.property column="online_instructions" type="text"
+     */
+    public String getOnlineInstructions() {
+	return onlineInstructions;
+    }
 
-	/**
-	 * NOTE: The reason that relation don't use save-update to persist message is MessageSeq table need save 
-	 * a record as well.   
-	 * 
-	 * @hibernate.set lazy="true"
-	 *                inverse="true"
-	 *                cascade="none"
-	 *                order-by="create_date desc"
-	 * @hibernate.collection-key column="forum_uid"
-	 * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.forum.persistence.Message"
-	 * 
-	 * @return
-	 */
-	public Set getMessages() {
-		return messages;
-	}
+    public void setOnlineInstructions(String onlineInstructions) {
+	this.onlineInstructions = onlineInstructions;
+    }
 
-	public void setMessages(Set messages) {
-		this.messages = messages;
-	}
+    /**
+     * @return Returns the onlineInstructions set by the teacher.
+     * 
+     * @hibernate.property column="offline_instructions" type="text"
+     */
+    public String getOfflineInstructions() {
+	return offlineInstructions;
+    }
 
-	/**
-	 * Updates the modification data for this entity.
-	 */
-	public void updateModificationData() {
+    public void setOfflineInstructions(String offlineInstructions) {
+	this.offlineInstructions = offlineInstructions;
+    }
 
-		long now = System.currentTimeMillis();
-		if (created == null) {
-			this.setCreated(new Date(now));
-		}
-		this.setUpdated(new Date(now));
-	}
+    /**
+     * 
+     * @hibernate.set lazy="true" cascade="all" inverse="false" order-by="create_date desc"
+     * @hibernate.collection-key column="forum_uid"
+     * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.forum.persistence.Attachment"
+     * 
+     * @return a set of Attachments to this Message.
+     */
+    public Set getAttachments() {
+	return attachments;
+    }
 
-	/**
-	 * @hibernate.property  column="content_in_use"
-	 * @return
-	 */
-	public boolean isContentInUse() {
-		return contentInUse;
-	}
+    /*
+     * @param attachments The attachments to set.
+     */
+    public void setAttachments(Set attachments) {
+	this.attachments = attachments;
+    }
 
-	public void setContentInUse(boolean contentInUse) {
-		this.contentInUse = contentInUse;
-	}
+    /**
+     * NOTE: The reason that relation don't use save-update to persist message is MessageSeq table need save a record as
+     * well.
+     * 
+     * @hibernate.set lazy="true" inverse="true" cascade="none" order-by="create_date desc"
+     * @hibernate.collection-key column="forum_uid"
+     * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.forum.persistence.Message"
+     * 
+     * @return
+     */
+    public Set getMessages() {
+	return messages;
+    }
 
-	/**
-	 * @hibernate.property column="define_later"
-	 * @return
-	 */
-	public boolean isDefineLater() {
-		return defineLater;
-	}
+    public void setMessages(Set messages) {
+	this.messages = messages;
+    }
 
-	public void setDefineLater(boolean defineLater) {
-		this.defineLater = defineLater;
-	}
+    /**
+     * Updates the modification data for this entity.
+     */
+    public void updateModificationData() {
 
-	/**
-	 * @hibernate.property column="content_id" unique="true" 
-	 * @return
-	 */
-	public Long getContentId() {
-		return contentId;
+	long now = System.currentTimeMillis();
+	if (created == null) {
+	    this.setCreated(new Date(now));
 	}
+	this.setUpdated(new Date(now));
+    }
 
-	public void setContentId(Long contentId) {
-		this.contentId = contentId;
-	}
+    /**
+     * @hibernate.property column="content_in_use"
+     * @return
+     */
+    public boolean isContentInUse() {
+	return contentInUse;
+    }
 
-	/**
-	 * @hibernate.property column="allow_edit"
-	 * @return
-	 */
-	public boolean isAllowEdit() {
-		return allowEdit;
-	}
+    public void setContentInUse(boolean contentInUse) {
+	this.contentInUse = contentInUse;
+    }
 
-	public void setAllowEdit(boolean allowEdit) {
-		this.allowEdit = allowEdit;
-	}
+    /**
+     * @hibernate.property column="define_later"
+     * @return
+     */
+    public boolean isDefineLater() {
+	return defineLater;
+    }
 
-	/**
-	 * @hibernate.property column="allow_rich_editor"
-	 * @return
-	 */
-	public boolean isAllowRichEditor() {
-		return allowRichEditor;
-	}
+    public void setDefineLater(boolean defineLater) {
+	this.defineLater = defineLater;
+    }
 
-	public void setAllowRichEditor(boolean allowRichEditor) {
-		this.allowRichEditor = allowRichEditor;
-	}
+    /**
+     * @hibernate.property column="content_id" unique="true"
+     * @return
+     */
+    public Long getContentId() {
+	return contentId;
+    }
 
-	public static Forum newInstance(Forum fromContent, Long contentId, ForumToolContentHandler forumToolContentHandler) {
-		Forum toContent = new Forum();
-		fromContent.toolContentHandler = forumToolContentHandler;
-		toContent = (Forum) fromContent.clone();
-		toContent.setContentId(contentId);
-		return toContent;
-	}
+    public void setContentId(Long contentId) {
+	this.contentId = contentId;
+    }
 
-	/**
-	 * @hibernate.property column="limited_of_chars"
-	 * @return
-	 */
-	public int getLimitedChar() {
-		return limitedChar;
-	}
+    /**
+     * @hibernate.property column="allow_edit"
+     * @return
+     */
+    public boolean isAllowEdit() {
+	return allowEdit;
+    }
 
-	public void setLimitedChar(int limitedChar) {
-		this.limitedChar = limitedChar;
-	}
+    public void setAllowEdit(boolean allowEdit) {
+	this.allowEdit = allowEdit;
+    }
 
-	/**
-	 * @hibernate.property column="limited_input_flag"
-	 * @return
-	 */
-	public boolean isLimitedInput() {
-		return limitedInput;
-	}
+    /**
+     * @hibernate.property column="allow_rich_editor"
+     * @return
+     */
+    public boolean isAllowRichEditor() {
+	return allowRichEditor;
+    }
 
-	public void setLimitedInput(boolean limitedInput) {
-		this.limitedInput = limitedInput;
-	}
+    public void setAllowRichEditor(boolean allowRichEditor) {
+	this.allowRichEditor = allowRichEditor;
+    }
 
-	public ForumToolContentHandler getToolContentHandler() {
-		return toolContentHandler;
-	}
+    public static Forum newInstance(Forum fromContent, Long contentId, ForumToolContentHandler forumToolContentHandler) {
+	Forum toContent = new Forum();
+	fromContent.toolContentHandler = forumToolContentHandler;
+	toContent = (Forum) fromContent.clone();
+	toContent.setContentId(contentId);
+	return toContent;
+    }
 
-	public void setToolContentHandler(ForumToolContentHandler toolContentHandler) {
-		this.toolContentHandler = toolContentHandler;
-	}
+    /**
+     * @hibernate.property column="limited_of_chars"
+     * @return
+     */
+    public int getLimitedChar() {
+	return limitedChar;
+    }
 
-	/**
-	 * @hibernate.property column="allow_new_topic"
-	 * @return
-	 */
-	public boolean isAllowNewTopic() {
-		return allowNewTopic;
-	}
+    public void setLimitedChar(int limitedChar) {
+	this.limitedChar = limitedChar;
+    }
 
-	public void setAllowNewTopic(boolean allowNewTopic) {
-		this.allowNewTopic = allowNewTopic;
-	}
+    /**
+     * @hibernate.property column="limited_input_flag"
+     * @return
+     */
+    public boolean isLimitedInput() {
+	return limitedInput;
+    }
 
-	/**
-	 * @hibernate.property column="allow_upload"
-	 * @return
-	 */
-	public boolean isAllowUpload() {
-		return allowUpload;
-	}
+    public void setLimitedInput(boolean limitedInput) {
+	this.limitedInput = limitedInput;
+    }
 
-	public void setAllowUpload(boolean allowUpload) {
-		this.allowUpload = allowUpload;
-	}
+    public ForumToolContentHandler getToolContentHandler() {
+	return toolContentHandler;
+    }
 
-	/**
-	 * @hibernate.property column="maximum_reply"
-	 * @return
-	 */
-	public int getMaximumReply() {
-		return maximumReply;
-	}
+    public void setToolContentHandler(ForumToolContentHandler toolContentHandler) {
+	this.toolContentHandler = toolContentHandler;
+    }
 
-	public void setMaximumReply(int maximumReply) {
-		this.maximumReply = maximumReply;
-	}
+    /**
+     * @hibernate.property column="allow_new_topic"
+     * @return
+     */
+    public boolean isAllowNewTopic() {
+	return allowNewTopic;
+    }
 
-	/**
-	 * @hibernate.property column="minimum_reply"
-	 * @return
-	 */
-	public int getMinimumReply() {
-		return minimumReply;
-	}
+    public void setAllowNewTopic(boolean allowNewTopic) {
+	this.allowNewTopic = allowNewTopic;
+    }
 
-	public void setMinimumReply(int minimumReply) {
-		this.minimumReply = minimumReply;
-	}
+    /**
+     * @hibernate.property column="allow_upload"
+     * @return
+     */
+    public boolean isAllowUpload() {
+	return allowUpload;
+    }
 
-	/**
-	 * @hibernate.property column="reflect_instructions"
-	 * @return
-	 */
-	public String getReflectInstructions() {
-		return reflectInstructions;
-	}
+    public void setAllowUpload(boolean allowUpload) {
+	this.allowUpload = allowUpload;
+    }
 
-	public void setReflectInstructions(String reflectInstructions) {
-		this.reflectInstructions = reflectInstructions;
-	}
+    /**
+     * @hibernate.property column="maximum_reply"
+     * @return
+     */
+    public int getMaximumReply() {
+	return maximumReply;
+    }
 
-	/**
-	 * @hibernate.property column="reflect_on_activity"
-	 * @return
-	 */
-	public boolean isReflectOnActivity() {
-		return reflectOnActivity;
-	}
+    public void setMaximumReply(int maximumReply) {
+	this.maximumReply = maximumReply;
+    }
 
-	public void setReflectOnActivity(boolean reflectOnActivity) {
-		this.reflectOnActivity = reflectOnActivity;
-	}
+    /**
+     * @hibernate.property column="minimum_reply"
+     * @return
+     */
+    public int getMinimumReply() {
+	return minimumReply;
+    }
 
-	/**
-	 * @hibernate.property column="mark_release_notify"
-	 * @return
-	 */
-	public boolean isNotifyLearnersOnMarkRelease() {
-		return notifyLearnersOnMarkRelease;
-	}
+    public void setMinimumReply(int minimumReply) {
+	this.minimumReply = minimumReply;
+    }
 
-	public void setNotifyLearnersOnMarkRelease(boolean notifyLearnersOnMarkRelease) {
-		this.notifyLearnersOnMarkRelease = notifyLearnersOnMarkRelease;
-	}
+    /**
+     * @hibernate.property column="reflect_instructions"
+     * @return
+     */
+    public String getReflectInstructions() {
+	return reflectInstructions;
+    }
+
+    public void setReflectInstructions(String reflectInstructions) {
+	this.reflectInstructions = reflectInstructions;
+    }
+
+    /**
+     * @hibernate.property column="reflect_on_activity"
+     * @return
+     */
+    public boolean isReflectOnActivity() {
+	return reflectOnActivity;
+    }
+
+    public void setReflectOnActivity(boolean reflectOnActivity) {
+	this.reflectOnActivity = reflectOnActivity;
+    }
+
+    /**
+     * @hibernate.property column="mark_release_notify"
+     * @return
+     */
+    public boolean isNotifyLearnersOnMarkRelease() {
+	return notifyLearnersOnMarkRelease;
+    }
+
+    public void setNotifyLearnersOnMarkRelease(boolean notifyLearnersOnMarkRelease) {
+	this.notifyLearnersOnMarkRelease = notifyLearnersOnMarkRelease;
+    }
+
+    /**
+     * @hibernate.set lazy="true" cascade="all"
+     *                sort="org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator"
+     * @hibernate.collection-key column="content_uid"
+     * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.forum.persistence.ForumCondition"
+     * 
+     */
+    public Set<ForumCondition> getConditions() {
+	return conditions;
+    }
+
+    public void setConditions(Set<ForumCondition> conditions) {
+	this.conditions = conditions;
+    }
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml
===================================================================
diff -u
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml	(revision 0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
+    
+<hibernate-mapping>
+	<joined-subclass 
+	    name="org.lamsfoundation.lams.tool.forum.persistence.ForumCondition" 
+	    table="tl_lafrum11_conditions"
+	    extends="org.lamsfoundation.lams.learningdesign.TextSearchCondition"
+	    lazy="false"
+	>
+	
+		<key column="condition_id" />
+	
+	    <set
+	            name="topics"
+	            table="tl_lafrum11_condition_topics"
+	            lazy="false"
+	            inverse="false"
+	            cascade="save-update"
+	            sort="unsorted"
+	            order-by="topic_uid asc"
+	            
+	     >
+	
+	            <key
+	                column="condition_id"
+	            >
+	            </key>
+	
+	            <many-to-many
+	                class="org.lamsfoundation.lams.tool.forum.persistence.Message"
+	                column="topic_uid"
+	             />
+	
+	    </set>
+	
+	</joined-subclass>
+</hibernate-mapping>
\ No newline at end of file
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.java
===================================================================
diff -u
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.java	(revision 0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.java	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -0,0 +1,217 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $$Id$$ */
+package org.lamsfoundation.lams.tool.forum.persistence;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.lamsfoundation.lams.learningdesign.BranchCondition;
+import org.lamsfoundation.lams.learningdesign.LearningDesign;
+import org.lamsfoundation.lams.learningdesign.TextSearchCondition;
+import org.lamsfoundation.lams.learningdesign.dto.BranchConditionDTO;
+import org.lamsfoundation.lams.tool.OutputType;
+import org.lamsfoundation.lams.tool.ToolOutput;
+import org.lamsfoundation.lams.tool.ToolOutputFormatException;
+import org.lamsfoundation.lams.tool.ToolOutputValue;
+import org.lamsfoundation.lams.tool.forum.util.ConditionTopicComparator;
+
+/**
+ * A text search condition with a set of topics on answers to which the search should be performed.
+ * 
+ * 
+ * @author Marcin Cieslak
+ * 
+ */
+public class ForumCondition extends TextSearchCondition {
+    /**
+     * Topics linked to this condition. Answers to them will be scanned for the words that make the condition's
+     * parameters.
+     */
+    private Set<Message> topics = new TreeSet<Message>(new ConditionTopicComparator());
+
+    public ForumCondition() {
+
+    }
+
+    public ForumCondition(BranchConditionDTO conditionDTO) {
+	super(conditionDTO);
+    }
+
+    public ForumCondition(Long conditionId, Integer conditionUIID, Integer orderId, String name, String displayName,
+	    String allWords, String phrase, String anyWords, String excludedWords, Set<Message> questions) {
+	super(conditionId, conditionUIID, orderId, name, displayName, BranchCondition.OUTPUT_TYPE_COMPLEX, null, null,
+		null, allWords, phrase, anyWords, excludedWords);
+	setTopics(questions);
+    }
+
+    @Override
+    public boolean isMet(ToolOutput output) throws ToolOutputFormatException {
+	boolean result = false;
+	if (output != null) {
+	    ToolOutputValue value = output.getValue();
+	    if (value != null) {
+		if (OutputType.OUTPUT_COMPLEX.equals(value.getType())) {
+		    // the condition "knows" it's a map of "topic creation date" -> "all learner's answers to that
+		    // topic"
+		    Map<Date, Set<String>> messages = (Map<Date, Set<String>>) value.getValue();
+		    result = true;
+
+		    /*
+		     * We want to check if for each topic all answer don't contain excluded words and at least one
+		     * answer contains the desired (all, any, phrase) words. That is why we check all, any and phrase
+		     * conditions using the "matches" method, but we check excluded words manually.
+		     */
+		    parseConditionStrings();
+		    List<String> excludedWordsCopy = getExcludedWordsCondition();
+		    setExcludedWordsCondition(null);
+
+		    for (Message topic : getTopics()) {
+			boolean singleTopicResult = false;
+			Set<String> answers = messages.get(topic.getCreated());
+			if (answers == null) {
+			    singleTopicResult = getAllWordsCondition() == null && getAnyWordsCondition() == null
+				    && getPhraseCondition() == null;
+			} else {
+			    for (String answer : answers) {
+				answer = removeHTMLtags(answer);
+				if (!singleTopicResult) {
+				    singleTopicResult = matches(answer);
+				}
+				if (matchExcludedWordsOnly(excludedWordsCopy, answer)) {
+				    singleTopicResult = false;
+				    break;
+				}
+			    }
+			}
+
+			result &= singleTopicResult;
+			// if at least one topic does not satisfy the condition, there
+			// is no need to look further
+			if (!result) {
+			    break;
+			}
+		    }
+		} else {
+		    throw new ToolOutputFormatException("Forum tool produced a non-complex tool output.");
+		}
+	    }
+	}
+	return result;
+    }
+
+    public Set<Message> getTopics() {
+	return topics;
+    }
+
+    public void setTopics(Set<Message> questions) {
+	topics = questions;
+    }
+
+    /**
+     * Notice that the original topics are assigned to the copy.
+     */
+    @Override
+    public Object clone() {
+	Set<Message> topicsCopy = new TreeSet<Message>(new ConditionTopicComparator());
+	topicsCopy.addAll(topics);
+	return new ForumCondition(null, null, orderId, name, displayName, allWords, phrase, anyWords, excludedWords,
+		topicsCopy);
+    }
+
+    /**
+     * Notice that topics are copied with very little information and then they are assigned to the cloned object. This
+     * method is used when assigning BranchActivityEntry needs, so only basic information (in fact, only creation date)
+     * is needed. Also, there should be no link to Forum content.
+     */
+    @Override
+    public ForumCondition clone(int uiidOffset) {
+	Integer newConditionUIID = LearningDesign.addOffset(conditionUIID, uiidOffset);
+	Set<Message> questionsCopy = new TreeSet<Message>(new ConditionTopicComparator());
+
+	for (Message topic : getTopics()) {
+	    Message topicCopy = new Message();
+	    topicCopy.setCreated(topic.getCreated());
+	    topicCopy.setSubject(topic.getSubject());
+	    questionsCopy.add(topicCopy);
+	}
+	return new ForumCondition(null, newConditionUIID, orderId, name, displayName, allWords, phrase, anyWords,
+		excludedWords, questionsCopy);
+    }
+
+    /**
+     * Notice that topics from the cloned (and not the original) tool content are assigned to the cloned condition. This
+     * method is used for cloning tool content.
+     */
+    public ForumCondition clone(Forum forum) {
+
+	Set<Message> topicsCopy = new TreeSet<Message>(new ConditionTopicComparator());
+	for (Message conditionTopic : getTopics()) {
+	    for (Message contentTopic : (Set<Message>) forum.getMessages()) {
+		if (contentTopic.getIsAuthored() && contentTopic.getCreated().equals(conditionTopic.getCreated())) {
+		    topicsCopy.add(contentTopic);
+		}
+	    }
+	}
+
+	return new ForumCondition(null, null, orderId, name, displayName, allWords, phrase, anyWords, excludedWords,
+		topicsCopy);
+    }
+
+    /**
+     * The condition must be bound with at least one topic.
+     */
+    @Override
+    protected boolean isValid() {
+	return getTopics() != null && !getTopics().isEmpty();
+    }
+
+    /**
+     * It filters the given text in order to find any of the unwanted words.
+     * 
+     * @param excludedWords
+     *                words to search for
+     * @param textToMatch
+     *                string to be filtered
+     * @return <code>true</code> if at least one of the words from the list is found in the text
+     */
+    private boolean matchExcludedWordsOnly(List<String> excludedWords, String textToMatch) {
+	if (textToMatch == null || excludedWords == null) {
+	    return false;
+	}
+	StringBuilder stringPattern = new StringBuilder();
+	for (String excludedWord : excludedWords) {
+	    stringPattern.append("(?:").append(TextSearchCondition.WORD_DELIMITER_REGEX).append(
+		    Pattern.quote(excludedWord)).append(TextSearchCondition.WORD_DELIMITER_REGEX).append(")|");
+	}
+	stringPattern.deleteCharAt(stringPattern.length() - 1);
+	Pattern regexPattern = Pattern.compile(stringPattern.toString(), TextSearchCondition.PATTERN_MATCHING_OPTIONS);
+	Matcher matcher = regexPattern.matcher(textToMatch);
+	return matcher.find();
+    }
+}
\ No newline at end of file
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumDao.java
===================================================================
diff -u -r4526bc668178760326017e561b75a0358e10b4fb -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumDao.java	(.../ForumDao.java)	(revision 4526bc668178760326017e561b75a0358e10b4fb)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumDao.java	(.../ForumDao.java)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -21,7 +21,7 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.forum.persistence;
 
 import java.util.List;
@@ -30,38 +30,50 @@
 
 /**
  * ForumDao
+ * 
  * @author conradb
- *
- *
+ * 
+ * 
  */
 public class ForumDao extends HibernateDaoSupport {
-	private static final String FIND_FORUM_BY_CONTENTID = "from Forum forum where forum.contentId=?";
-	
-	public void saveOrUpdate(Forum forum) {
-		forum.updateModificationData();
-		this.getHibernateTemplate().saveOrUpdate(forum);
-	}
+    private static final String FIND_FORUM_BY_CONTENTID = "from Forum forum where forum.contentId=?";
 
-	public Forum getById(Long forumId) {
-		return (Forum) getHibernateTemplate().get(Forum.class,forumId);
+    public void saveOrUpdate(Forum forum) {
+	forum.updateModificationData();
+	this.getHibernateTemplate().saveOrUpdate(forum);
+    }
+
+    public Forum getById(Long forumId) {
+	return (Forum) getHibernateTemplate().get(Forum.class, forumId);
+    }
+
+    /**
+     * NOTE: before call this method, must be sure delete all messages in this forum. Example code like this:
+     * 
+     * <pre>
+     * <code>
+     * messageDao.deleteForumMessage(forum.getUuid());
+     * </code>
+     * </pre>
+     * 
+     * @param forum
+     */
+    public void delete(Forum forum) {
+	this.getHibernateTemplate().delete(forum);
+    }
+
+    public Forum getByContentId(Long contentID) {
+	List list = getHibernateTemplate().find(ForumDao.FIND_FORUM_BY_CONTENTID, contentID);
+	if (list != null && list.size() > 0) {
+	    return (Forum) list.get(0);
+	} else {
+	    return null;
 	}
-	/**
-	 * NOTE: before call this method, must be sure delete all messages in this forum.
-	 * Example code like this:
-	 * <pre>
-	 * <code>messageDao.deleteForumMessage(forum.getUuid());</code>
-	 * </pre>
-	 * @param forum
-	 */
-	public void delete(Forum forum) {
-		this.getHibernateTemplate().delete(forum);
-	}
+    }
 
-	public Forum getByContentId(Long contentID) {
-		List list = getHibernateTemplate().find(FIND_FORUM_BY_CONTENTID,contentID);
-		if(list != null && list.size() > 0)
-			return (Forum) list.get(0);
-		else
-			return null;
+    public void deleteCondition(ForumCondition condition) {
+	if (condition != null && condition.getConditionId() != null) {
+	    this.getHibernateTemplate().delete(condition);
 	}
+    }
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java
===================================================================
diff -u -ra818550d0d742ccd872808a455481913b88d8901 -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java	(.../ForumOutputFactory.java)	(revision a818550d0d742ccd872808a455481913b88d8901)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java	(.../ForumOutputFactory.java)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -23,61 +23,183 @@
 /* $Id$ */
 package org.lamsfoundation.lams.tool.forum.service;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
+import java.util.TreeSet;
 
+import org.lamsfoundation.lams.learningdesign.BranchCondition;
 import org.lamsfoundation.lams.tool.OutputFactory;
 import org.lamsfoundation.lams.tool.ToolOutput;
 import org.lamsfoundation.lams.tool.ToolOutputDefinition;
 import org.lamsfoundation.lams.tool.exception.ToolException;
+import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
+import org.lamsfoundation.lams.tool.forum.persistence.Forum;
+import org.lamsfoundation.lams.tool.forum.persistence.ForumCondition;
+import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession;
+import org.lamsfoundation.lams.tool.forum.persistence.ForumUser;
+import org.lamsfoundation.lams.tool.forum.persistence.Message;
+import org.lamsfoundation.lams.tool.forum.util.ForumConstants;
 
 /**
- * Creates the output definitions for forum. Eventually there will be a definition 
- * that outputs some or all of the forum queries, but for now there are just a couple of
- * simple definitions so that we can try various features of the tool output based 
- * branching.
+ * Creates the output definitions for forum. Currently it provides two types of output - an user answers represented by
+ * an map "topic creation date" -> "all learner's answers to that topic" (output type "OUTPUT_COMPLEX") and range
+ * definition for number of words entered by an user.
  */
 public class ForumOutputFactory extends OutputFactory {
 
-	/** The number of posts the learner has made in one forum activity. */
-	protected final static String OUTPUT_NAME_LEARNER_NUM_POSTS = "learner.number.of.posts";
-	
-	/** 
-	 * @see org.lamsfoundation.lams.tool.OutputDefinitionFactory#getToolOutputDefinitions(java.lang.Object)
-	 */
-	public SortedMap<String, ToolOutputDefinition> getToolOutputDefinitions(
-			Object toolContentObject) throws ToolException {
-		TreeMap<String, ToolOutputDefinition> definitionMap =  new TreeMap<String, ToolOutputDefinition>();
-		
-		ToolOutputDefinition definition = buildRangeDefinition(OUTPUT_NAME_LEARNER_NUM_POSTS, new Long(0), null);
-		definitionMap.put(OUTPUT_NAME_LEARNER_NUM_POSTS, definition);
+    /**
+     * @see org.lamsfoundation.lams.tool.OutputDefinitionFactory#getToolOutputDefinitions(java.lang.Object)
+     */
+    @Override
+    public SortedMap<String, ToolOutputDefinition> getToolOutputDefinitions(Object toolContentObject)
+	    throws ToolException {
 
-		return definitionMap;
-	}
-
-	public SortedMap<String, ToolOutput> getToolOutput(List<String> names, IForumService forumService,
-			Long toolSessionId, Long learnerId) {
-		
-		TreeMap<String,ToolOutput> map = new TreeMap<String,ToolOutput>();
-		if ( names == null || names.contains(OUTPUT_NAME_LEARNER_NUM_POSTS)) {
-			map.put(OUTPUT_NAME_LEARNER_NUM_POSTS,getNumPosts(forumService, learnerId, toolSessionId));
+	SortedMap<String, ToolOutputDefinition> definitionMap = new TreeMap<String, ToolOutputDefinition>();
+	if (toolContentObject != null) {
+	    ToolOutputDefinition chosenTopicAnswersDefinition = buildComplexOutputDefinition(ForumConstants.TEXT_SEARCH_DEFINITION_NAME);
+	    Forum forum = (Forum) toolContentObject;
+	    // adding all existing conditions
+	    chosenTopicAnswersDefinition.setDefaultConditions(new ArrayList<BranchCondition>(forum.getConditions()));
+	    // if no conditions were created in the tool instance, a default condition is added; the condition is
+	    // persisted in ForumService.
+	    if (chosenTopicAnswersDefinition.getDefaultConditions().isEmpty() && !forum.getMessages().isEmpty()) {
+		Set<Message> messages = new HashSet<Message>();
+		for (Message message : (Set<Message>) forum.getMessages()) {
+		    if (message.getIsAuthored()) {
+			messages.add(message);
+			break;
+		    }
 		}
-		return map;
 
+		String name = buildConditionName(ForumConstants.TEXT_SEARCH_DEFINITION_NAME, forum.getContentId()
+			.toString());
+		// Default condition checks if the answers for the first topic contain word "LAMS"
+		ForumCondition defaultCondition = new ForumCondition(null, null, 1, name, getI18NText(
+			ForumConstants.TEXT_SEARCH_DEFAULT_CONDITION_DISPLAY_NAME_KEY, false), "LAMS", null, null,
+			null, messages);
+		forum.getConditions().add(defaultCondition);
+		chosenTopicAnswersDefinition.getDefaultConditions().add(defaultCondition);
+	    }
+	    chosenTopicAnswersDefinition.setShowConditionNameOnly(true);
+	    definitionMap.put(ForumConstants.TEXT_SEARCH_DEFINITION_NAME, chosenTopicAnswersDefinition);
 	}
 
-	public ToolOutput getToolOutput(String name, IForumService forumService, Long toolSessionId, Long learnerId) {
-		
-		if ( name != null && name.equals(OUTPUT_NAME_LEARNER_NUM_POSTS)) {
-			 return getNumPosts(forumService, learnerId, toolSessionId);
+	ToolOutputDefinition numberOfPostsDefinition = buildRangeDefinition(
+		ForumConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, new Long(0), null);
+	definitionMap.put(ForumConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, numberOfPostsDefinition);
+
+	return definitionMap;
+    }
+
+    public SortedMap<String, ToolOutput> getToolOutput(List<String> names, IForumService forumService,
+	    Long toolSessionId, Long learnerId) {
+	TreeMap<String, ToolOutput> outputs = new TreeMap<String, ToolOutput>();
+	// cached tool output for all text search conditions
+	ToolOutput chosenTopicAnswersOutput = null;
+
+	if (names == null) {
+	    // output will be set for all the existing conditions
+	    ForumToolSession session = forumService.getSessionBySessionId(toolSessionId);
+	    Forum forum = session.getForum();
+	    Set<ForumCondition> conditions = forum.getConditions();
+	    for (ForumCondition condition : conditions) {
+		String name = condition.getName();
+		if (isTextSearchConditionName(name) && chosenTopicAnswersOutput != null) {
+		    outputs.put(name, chosenTopicAnswersOutput);
+		} else {
+		    ToolOutput output = getToolOutput(name, forumService, toolSessionId, learnerId);
+		    if (output != null) {
+			outputs.put(name, output);
+			if (isTextSearchConditionName(name)) {
+			    chosenTopicAnswersOutput = output;
+			}
+		    }
 		}
-		return null;
+	    }
+	} else {
+	    for (String name : names) {
+		if (isTextSearchConditionName(name) && chosenTopicAnswersOutput != null) {
+		    outputs.put(name, chosenTopicAnswersOutput);
+		} else {
+		    ToolOutput output = getToolOutput(name, forumService, toolSessionId, learnerId);
+		    if (output != null) {
+			outputs.put(name, output);
+			if (isTextSearchConditionName(name)) {
+			    chosenTopicAnswersOutput = output;
+			}
+		    }
+		}
+	    }
+	}
 
+	if (names == null || names.contains(ForumConstants.LEARNER_NUM_POSTS_DEFINITION_NAME)) {
+	    outputs.put(ForumConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, getNumPosts(forumService, learnerId,
+		    toolSessionId));
 	}
+	return outputs;
 
-	private ToolOutput getNumPosts(IForumService forumService, Long learnerId, Long toolSessionId) {
-		int num = forumService.getTopicsNum(learnerId, toolSessionId);		
-		return new ToolOutput(OUTPUT_NAME_LEARNER_NUM_POSTS, getI18NText(OUTPUT_NAME_LEARNER_NUM_POSTS, true), new Long(num));
+    }
+
+    public ToolOutput getToolOutput(String name, IForumService forumService, Long toolSessionId, Long learnerId) {
+	ToolOutput toolOutput = null;
+	if (isTextSearchConditionName(ForumConstants.TEXT_SEARCH_DEFINITION_NAME)) {
+	    // a map of "topic creation date" -> "all learner's answers to that topic"
+	    Map<Date, Set<String>> answers = new HashMap<Date, Set<String>>();
+
+	    ForumUser user = forumService.getUserByUserAndSession(learnerId, toolSessionId);
+	    List<MessageDTO> userMessages = forumService.getMessagesByUserUid(user.getUid(), toolSessionId);
+
+	    if (userMessages != null) {
+		for (MessageDTO messageDTO : userMessages) {
+		    Message message = messageDTO.getMessage();
+
+		    Message parentMessage = message;
+		    // we're looking for the top parent i.e. topic
+		    while (parentMessage.getParent() != null) {
+			parentMessage = parentMessage.getParent();
+		    }
+		    // topics are recognised by creation date and not by order ID as in other tools
+		    Date createdDate = parentMessage.getCreated();
+		    Set<String> textAnswers = answers.get(createdDate);
+		    if (textAnswers == null) {
+			textAnswers = new TreeSet<String>();
+		    }
+		    textAnswers.add(message.getBody());
+		    answers.put(createdDate, textAnswers);
+		}
+	    }
+	    toolOutput = new ToolOutput(name, getI18NText(ForumConstants.TEXT_SEARCH_DEFINITION_NAME, true), answers,
+		    false);
+	} else if (name != null && name.equals(ForumConstants.LEARNER_NUM_POSTS_DEFINITION_NAME)) {
+	    toolOutput = getNumPosts(forumService, learnerId, toolSessionId);
 	}
+	return toolOutput;
+
+    }
+
+    private ToolOutput getNumPosts(IForumService forumService, Long learnerId, Long toolSessionId) {
+	int num = forumService.getTopicsNum(learnerId, toolSessionId);
+	return new ToolOutput(ForumConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, getI18NText(
+		ForumConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, true), new Long(num));
+    }
+
+    @Override
+    protected String[] splitConditionName(String conditionName) {
+	return super.splitConditionName(conditionName);
+    }
+
+    protected String buildTextSearchConditionName(String uniquePart) {
+	return super.buildConditionName(ForumConstants.TEXT_SEARCH_DEFINITION_NAME, uniquePart);
+    }
+
+    private boolean isTextSearchConditionName(String name) {
+	return name != null && name.startsWith(ForumConstants.TEXT_SEARCH_DEFINITION_NAME);
+    }
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -ra01292ae06e058ffcc16aaeec6d61959a7b69273 -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -27,12 +27,14 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
@@ -73,6 +75,7 @@
 import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
 import org.lamsfoundation.lams.tool.forum.persistence.AttachmentDao;
 import org.lamsfoundation.lams.tool.forum.persistence.Forum;
+import org.lamsfoundation.lams.tool.forum.persistence.ForumCondition;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumDao;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumException;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumReport;
@@ -107,1115 +110,1153 @@
  * @version $Revision$
  */
 public class ForumService implements IForumService, ToolContentManager, ToolSessionManager, ToolContentImport102Manager {
-	private static final Logger log = Logger.getLogger(ForumService.class);
+    private static final Logger log = Logger.getLogger(ForumService.class);
 
-	//DAO variables
-	private ForumDao forumDao;
+    // DAO variables
+    private ForumDao forumDao;
 
-	private AttachmentDao attachmentDao;
+    private AttachmentDao attachmentDao;
 
-	private MessageDao messageDao;
+    private MessageDao messageDao;
 
-	private MessageSeqDao messageSeqDao;
+    private MessageSeqDao messageSeqDao;
 
-	private ForumUserDao forumUserDao;
+    private ForumUserDao forumUserDao;
 
-	private ForumToolSessionDao forumToolSessionDao;
+    private ForumToolSessionDao forumToolSessionDao;
 
-	private ForumReportDAO forumReportDAO;
+    private ForumReportDAO forumReportDAO;
 
-	//system level handler and service 
-	private ILamsToolService toolService;
+    // system level handler and service
+    private ILamsToolService toolService;
 
-	private ForumToolContentHandler forumToolContentHandler;
+    private ForumToolContentHandler forumToolContentHandler;
 
-	private IRepositoryService repositoryService;
+    private IRepositoryService repositoryService;
 
-	private ILearnerService learnerService;
+    private ILearnerService learnerService;
 
-	private IAuditService auditService;
+    private IAuditService auditService;
 
-	private MessageService messageService;
+    private MessageService messageService;
 
-	private IExportToolContentService exportContentService;
+    private IExportToolContentService exportContentService;
 
-	private IUserManagementService userManagementService;
+    private IUserManagementService userManagementService;
 
-	private ICoreNotebookService coreNotebookService;
+    private ICoreNotebookService coreNotebookService;
 
-	private ForumOutputFactory forumOutputFactory;
+    private ForumOutputFactory forumOutputFactory;
 
-	private IEventNotificationService eventNotificationService;
+    private IEventNotificationService eventNotificationService;
+    private Random generator = new Random();
 
-	//---------------------------------------------------------------------
-	// Inversion of Control Methods - Method injection
-	//---------------------------------------------------------------------
-	public void setAuditService(IAuditService auditService) {
-		this.auditService = auditService;
-	}
+    // ---------------------------------------------------------------------
+    // Inversion of Control Methods - Method injection
+    // ---------------------------------------------------------------------
+    public void setAuditService(IAuditService auditService) {
+	this.auditService = auditService;
+    }
 
-	public IAuditService getAuditService() {
-		return auditService;
-	}
+    public IAuditService getAuditService() {
+	return auditService;
+    }
 
-	public void setMessageService(MessageService messageService) {
-		this.messageService = messageService;
-	}
+    public void setMessageService(MessageService messageService) {
+	this.messageService = messageService;
+    }
 
-	public ForumOutputFactory getForumOutputFactory() {
-		return forumOutputFactory;
-	}
+    public ForumOutputFactory getForumOutputFactory() {
+	return forumOutputFactory;
+    }
 
-	public void setForumOutputFactory(ForumOutputFactory forumOutputFactory) {
-		this.forumOutputFactory = forumOutputFactory;
-	}
+    public void setForumOutputFactory(ForumOutputFactory forumOutputFactory) {
+	this.forumOutputFactory = forumOutputFactory;
+    }
 
-	public Forum updateForum(Forum forum) throws PersistenceException {
-		forumDao.saveOrUpdate(forum);
-		return forum;
-	}
+    public Forum updateForum(Forum forum) throws PersistenceException {
+	forumDao.saveOrUpdate(forum);
+	return forum;
+    }
 
-	public Forum getForum(Long forumUid) throws PersistenceException {
-		return forumDao.getById(forumUid);
-	}
+    public Forum getForum(Long forumUid) throws PersistenceException {
+	return forumDao.getById(forumUid);
+    }
 
-	public Forum getForumByContentId(Long contentID) throws PersistenceException {
-		return forumDao.getByContentId(contentID);
+    public Forum getForumByContentId(Long contentID) throws PersistenceException {
+	return forumDao.getByContentId(contentID);
+    }
+
+    public void deleteForumAttachment(Long attachmentId) throws PersistenceException {
+	Attachment attachment = attachmentDao.getById(attachmentId);
+	attachmentDao.delete(attachment);
+    }
+
+    public Message createRootTopic(Long forumId, Long sessionId, Message message) throws PersistenceException {
+	return createRootTopic(forumId, getSessionBySessionId(sessionId), message);
+    }
+
+    public Message createRootTopic(Long forumId, ForumToolSession session, Message message) throws PersistenceException {
+	// get Forum and ForumToolSesion
+	if (message.getForum() == null) {
+	    Forum forum = forumDao.getById(forumId);
+	    message.setForum(forum);
 	}
+	// if topic created by author, session will be null.
+	if (session != null) {
+	    message.setToolSession(session);
+	}
 
-	public void deleteForumAttachment(Long attachmentId) throws PersistenceException {
-		Attachment attachment = attachmentDao.getById(attachmentId);
-		attachmentDao.delete(attachment);
+	if (message.getUid() == null) {
+	    // update message sequence
+	    MessageSeq msgSeq = new MessageSeq();
+	    msgSeq.setMessage(message);
+	    msgSeq.setMessageLevel((short) 0);
+	    // set itself as root
+	    msgSeq.setRootMessage(message);
+	    messageSeqDao.save(msgSeq);
 	}
 
-	public Message createRootTopic(Long forumId, Long sessionId, Message message) throws PersistenceException {
-		return createRootTopic(forumId, getSessionBySessionId(sessionId), message);
+	// if this message had any cloned objects, they also need to be changed.
+	// this will only happen if an authored topic is changed via monitoring
+	if (message.getSessionClones().size() > 0) {
+	    Iterator iter = message.getSessionClones().iterator();
+	    while (iter.hasNext()) {
+		Message clone = (Message) iter.next();
+		message.updateClone(clone);
+	    }
 	}
 
-	public Message createRootTopic(Long forumId, ForumToolSession session, Message message) throws PersistenceException {
-		//get Forum and ForumToolSesion
-		if (message.getForum() == null) {
-			Forum forum = forumDao.getById(forumId);
-			message.setForum(forum);
-		}
-		//if topic created by author, session will be null.
-		if (session != null) {
-			message.setToolSession(session);
-		}
+	// create message in database
+	messageDao.saveOrUpdate(message);
 
-		if (message.getUid() == null) {
-			//update message sequence
-			MessageSeq msgSeq = new MessageSeq();
-			msgSeq.setMessage(message);
-			msgSeq.setMessageLevel((short) 0);
-			//set itself as root
-			msgSeq.setRootMessage(message);
-			messageSeqDao.save(msgSeq);
-		}
+	return message;
+    }
 
-		// if this message had any cloned objects, they also need to be changed.
-		// this will only happen if an authored topic is changed via monitoring
-		if (message.getSessionClones().size() > 0) {
-			Iterator iter = message.getSessionClones().iterator();
-			while (iter.hasNext()) {
-				Message clone = (Message) iter.next();
-				message.updateClone(clone);
-			}
-		}
+    public Message updateTopic(Message message) throws PersistenceException {
 
-		//create message in database
-		messageDao.saveOrUpdate(message);
+	// update message
+	messageDao.saveOrUpdate(message);
 
-		return message;
-	}
+	// udate root message's lastReply date if this message
+	// if this message is root message, then actually, it will update itself lastReplayDate
+	MessageSeq msgSeq = messageSeqDao.getByTopicId(message.getUid());
+	Message root = msgSeq.getRootMessage();
+	// update reply date
+	messageDao.saveOrUpdate(root);
 
-	public Message updateTopic(Message message) throws PersistenceException {
+	return message;
+    }
 
-		//update message
-		messageDao.saveOrUpdate(message);
+    public void updateReport(ForumReport report) {
+	forumReportDAO.saveObject(report);
+    }
 
-		//udate root message's lastReply date if this message
-		//if this message is root message, then actually, it will update itself lastReplayDate
-		MessageSeq msgSeq = messageSeqDao.getByTopicId(message.getUid());
-		Message root = msgSeq.getRootMessage();
-		//update reply date
-		messageDao.saveOrUpdate(root);
+    public Message updateMessageHideFlag(Long messageId, boolean hideFlag) {
 
-		return message;
-	}
+	Message message = getMessage(messageId);
+	if (message != null) {
+	    Long userId = 0L;
+	    String loginName = "Default";
+	    if (message.getCreatedBy() == null) {
+		userId = message.getCreatedBy().getUserId();
+		loginName = message.getCreatedBy().getLoginName();
+	    }
+	    if (hideFlag) {
+		auditService.logHideEntry(ForumConstants.TOOL_SIGNATURE, userId, loginName, message.toString());
+	    } else {
+		auditService.logShowEntry(ForumConstants.TOOL_SIGNATURE, userId, loginName, message.toString());
+	    }
 
-	public void updateReport(ForumReport report) {
-		forumReportDAO.saveObject(report);
+	    message.setHideFlag(hideFlag);
+
+	    // update message
+	    messageDao.update(message);
 	}
+	return message;
+    }
 
-	public Message updateMessageHideFlag(Long messageId, boolean hideFlag) {
+    public Message getMessage(Long messageUid) throws PersistenceException {
+	return messageDao.getById(messageUid);
+    }
 
-		Message message = getMessage(messageId);
-		if (message != null) {
-			Long userId = 0L;
-			String loginName = "Default";
-			if (message.getCreatedBy() == null) {
-				userId = message.getCreatedBy().getUserId();
-				loginName = message.getCreatedBy().getLoginName();
-			}
-			if (hideFlag) {
-				auditService.logHideEntry(ForumConstants.TOOL_SIGNATURE, userId, loginName, message.toString());
-			}
-			else {
-				auditService.logShowEntry(ForumConstants.TOOL_SIGNATURE, userId, loginName, message.toString());
-			}
+    public void deleteTopic(Long topicUid) throws PersistenceException {
+	List children = messageDao.getChildrenTopics(topicUid);
+	// cascade delete children topic by recursive
+	if (children != null) {
+	    Iterator iter = children.iterator();
+	    while (iter.hasNext()) {
+		Message msg = (Message) iter.next();
+		this.deleteTopic(msg.getUid());
+	    }
+	}
+	messageSeqDao.deleteByTopicId(topicUid);
+	messageDao.delete(topicUid);
+    }
 
-			message.setHideFlag(hideFlag);
+    public void deleteCondition(ForumCondition condition) throws PersistenceException {
+	forumDao.deleteCondition(condition);
+    }
 
-			// update message
-			messageDao.update(message);
-		}
-		return message;
-	}
+    public Message replyTopic(Long parentId, Long sessionId, Message replyMessage) throws PersistenceException {
+	// set parent
+	Message parent = this.getMessage(parentId);
+	replyMessage.setParent(parent);
+	replyMessage.setForum(parent.getForum());
+	// parent sessionID maybe empty if created by author role. So given sessionId is exactly value.
+	ForumToolSession session = getSessionBySessionId(sessionId);
+	replyMessage.setToolSession(session);
+	messageDao.saveOrUpdate(replyMessage);
 
-	public Message getMessage(Long messageUid) throws PersistenceException {
-		return messageDao.getById(messageUid);
+	// get root topic and create record in MessageSeq table
+	MessageSeq parentSeq = messageSeqDao.getByTopicId(parent.getUid());
+	if (parentSeq == null) {
+	    ForumService.log.error("Message Sequence table is broken becuase topic " + parent
+		    + " can not get Sequence Record");
 	}
+	Message root = parentSeq.getRootMessage();
+	MessageSeq msgSeq = new MessageSeq();
+	msgSeq.setMessage(replyMessage);
+	msgSeq.setMessageLevel((short) (parentSeq.getMessageLevel() + 1));
+	msgSeq.setRootMessage(root);
+	messageSeqDao.save(msgSeq);
 
-	public void deleteTopic(Long topicUid) throws PersistenceException {
-		List children = messageDao.getChildrenTopics(topicUid);
-		//cascade delete children topic by recursive
-		if (children != null) {
-			Iterator iter = children.iterator();
-			while (iter.hasNext()) {
-				Message msg = (Message) iter.next();
-				this.deleteTopic(msg.getUid());
-			}
-		}
-		messageSeqDao.deleteByTopicId(topicUid);
-		messageDao.delete(topicUid);
-	}
+	// update last reply date for root message
+	root.setLastReplyDate(new Date());
+	// update reply message number for root
+	root.setReplyNumber(root.getReplyNumber() + 1);
+	messageDao.saveOrUpdate(root);
 
-	public Message replyTopic(Long parentId, Long sessionId, Message replyMessage) throws PersistenceException {
-		//set parent
-		Message parent = this.getMessage(parentId);
-		replyMessage.setParent(parent);
-		replyMessage.setForum(parent.getForum());
-		//parent sessionID maybe empty if created by author role. So given sessionId is exactly value.
-		ForumToolSession session = getSessionBySessionId(sessionId);
-		replyMessage.setToolSession(session);
-		messageDao.saveOrUpdate(replyMessage);
+	return replyMessage;
+    }
 
-		//get root topic and create record in MessageSeq table
-		MessageSeq parentSeq = messageSeqDao.getByTopicId(parent.getUid());
-		if (parentSeq == null) {
-			ForumService.log.error("Message Sequence table is broken becuase topic " + parent + " can not get Sequence Record");
-		}
-		Message root = parentSeq.getRootMessage();
-		MessageSeq msgSeq = new MessageSeq();
-		msgSeq.setMessage(replyMessage);
-		msgSeq.setMessageLevel((short) (parentSeq.getMessageLevel() + 1));
-		msgSeq.setRootMessage(root);
-		messageSeqDao.save(msgSeq);
-
-		//update last reply date for root message
-		root.setLastReplyDate(new Date());
-		//update reply message number for root 
-		root.setReplyNumber(root.getReplyNumber() + 1);
-		messageDao.saveOrUpdate(root);
-
-		return replyMessage;
+    public Attachment uploadInstructionFile(FormFile uploadFile, String fileType) throws PersistenceException {
+	if (uploadFile == null || StringUtils.isEmpty(uploadFile.getFileName())) {
+	    throw new ForumException("Could not find upload file: " + uploadFile);
 	}
 
-	public Attachment uploadInstructionFile(FormFile uploadFile, String fileType) throws PersistenceException {
-		if (uploadFile == null || StringUtils.isEmpty(uploadFile.getFileName())) {
-			throw new ForumException("Could not find upload file: " + uploadFile);
-		}
+	// upload file to repository
+	NodeKey nodeKey = processFile(uploadFile, fileType);
 
-		//upload file to repository
-		NodeKey nodeKey = processFile(uploadFile, fileType);
+	// create new attachement
+	Attachment file = new Attachment();
+	file.setFileType(fileType);
+	file.setFileUuid(nodeKey.getUuid());
+	file.setFileVersionId(nodeKey.getVersion());
+	file.setFileName(uploadFile.getFileName());
+	file.setCreated(new Date());
 
-		//create new attachement
-		Attachment file = new Attachment();
-		file.setFileType(fileType);
-		file.setFileUuid(nodeKey.getUuid());
-		file.setFileVersionId(nodeKey.getVersion());
-		file.setFileName(uploadFile.getFileName());
-		file.setCreated(new Date());
+	return file;
 
-		return file;
+    }
 
+    /**
+     * 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());
 	}
+    }
 
-	/**
-	 * 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 Attachment uploadAttachment(FormFile uploadFile) throws PersistenceException {
+	if (uploadFile == null || StringUtils.isEmpty(uploadFile.getFileName())) {
+	    throw new ForumException("Could not find upload file: " + uploadFile);
 	}
 
-	public Attachment uploadAttachment(FormFile uploadFile) throws PersistenceException {
-		if (uploadFile == null || StringUtils.isEmpty(uploadFile.getFileName())) {
-			throw new ForumException("Could not find upload file: " + uploadFile);
-		}
+	NodeKey nodeKey = processFile(uploadFile, IToolContentHandler.TYPE_ONLINE);
+	Attachment file = new Attachment();
+	file.setFileType(IToolContentHandler.TYPE_ONLINE);
+	file.setFileUuid(nodeKey.getUuid());
+	file.setFileVersionId(nodeKey.getVersion());
+	file.setFileName(uploadFile.getFileName());
 
-		NodeKey nodeKey = processFile(uploadFile, IToolContentHandler.TYPE_ONLINE);
-		Attachment file = new Attachment();
-		file.setFileType(IToolContentHandler.TYPE_ONLINE);
-		file.setFileUuid(nodeKey.getUuid());
-		file.setFileVersionId(nodeKey.getVersion());
-		file.setFileName(uploadFile.getFileName());
+	return file;
+    }
 
-		return file;
+    public List getTopicThread(Long rootTopicId) {
+
+	List unsortedThread = messageSeqDao.getTopicThread(rootTopicId);
+	Iterator iter = unsortedThread.iterator();
+	MessageSeq msgSeq;
+	SortedMap<MessageSeq, Message> map = new TreeMap<MessageSeq, Message>(new TopicComparator());
+	while (iter.hasNext()) {
+	    msgSeq = (MessageSeq) iter.next();
+	    map.put(msgSeq, msgSeq.getMessage());
 	}
+	return getSortedMessageDTO(map);
+    }
 
-	public List getTopicThread(Long rootTopicId) {
+    public List getRootTopics(Long sessionId) {
+	List topicsBySession = messageDao.getRootTopics(sessionId);
+	ForumToolSession session = getSessionBySessionId(sessionId);
+	if (session == null || session.getForum() == null) {
+	    ForumService.log.error("Failed on getting session by given sessionID:" + sessionId);
+	    throw new ForumException("Failed on getting session by given sessionID:" + sessionId);
+	}
 
-		List unsortedThread = messageSeqDao.getTopicThread(rootTopicId);
-		Iterator iter = unsortedThread.iterator();
-		MessageSeq msgSeq;
-		SortedMap<MessageSeq, Message> map = new TreeMap<MessageSeq, Message>(new TopicComparator());
-		while (iter.hasNext()) {
-			msgSeq = (MessageSeq) iter.next();
-			map.put(msgSeq, msgSeq.getMessage());
-		}
-		return getSortedMessageDTO(map);
+	// sorted by last post date
+	Message msg;
+	SortedMap<Date, Message> map = new TreeMap<Date, Message>(new DateComparator());
+	Iterator iter = topicsBySession.iterator();
+	while (iter.hasNext()) {
+	    msg = (Message) iter.next();
+	    if (ForumConstants.OLD_FORUM_STYLE) {
+		map.put(msg.getCreated(), msg);
+	    } else {
+		map.put(msg.getLastReplyDate(), msg);
+	    }
 	}
+	return MessageDTO.getMessageDTO(new ArrayList<Message>(map.values()));
 
-	public List getRootTopics(Long sessionId) {
-		List topicsBySession = messageDao.getRootTopics(sessionId);
-		ForumToolSession session = getSessionBySessionId(sessionId);
-		if (session == null || session.getForum() == null) {
-			ForumService.log.error("Failed on getting session by given sessionID:" + sessionId);
-			throw new ForumException("Failed on getting session by given sessionID:" + sessionId);
-		}
+    }
 
-		//sorted by last post date
-		Message msg;
-		SortedMap<Date, Message> map = new TreeMap<Date, Message>(new DateComparator());
-		Iterator iter = topicsBySession.iterator();
-		while (iter.hasNext()) {
-			msg = (Message) iter.next();
-			if (ForumConstants.OLD_FORUM_STYLE) {
-				map.put(msg.getCreated(), msg);
-			}
-			else {
-				map.put(msg.getLastReplyDate(), msg);
-			}
-		}
-		return MessageDTO.getMessageDTO(new ArrayList<Message>(map.values()));
+    public int getTopicsNum(Long userID, Long sessionId) {
+	return messageDao.getTopicsNum(userID, sessionId);
+    }
 
-	}
+    public int getNumOfPostsByTopic(Long userId, Long topicId) {
+	return messageSeqDao.getNumOfPostsByTopic(userId, topicId);
+    }
 
-	public int getTopicsNum(Long userID, Long sessionId) {
-		return messageDao.getTopicsNum(userID, sessionId);
-	}
+    public ForumUser getUserByID(Long userId) {
+	return forumUserDao.getByUserId(userId);
+    }
 
-	public int getNumOfPostsByTopic(Long userId, Long topicId) {
-		return messageSeqDao.getNumOfPostsByTopic(userId, topicId);
-	}
+    public ForumUser getUserByUserAndSession(Long userId, Long sessionId) {
+	return forumUserDao.getByUserIdAndSessionId(userId, sessionId);
+    }
 
-	public ForumUser getUserByID(Long userId) {
-		return forumUserDao.getByUserId(userId);
-	}
+    public void createUser(ForumUser forumUser) {
+	forumUserDao.save(forumUser);
+    }
 
-	public ForumUser getUserByUserAndSession(Long userId, Long sessionId) {
-		return forumUserDao.getByUserIdAndSessionId(userId, sessionId);
-	}
+    public ForumToolSession getSessionBySessionId(Long sessionId) {
+	return forumToolSessionDao.getBySessionId(sessionId);
+    }
 
-	public void createUser(ForumUser forumUser) {
-		forumUserDao.save(forumUser);
+    public Long getRootTopicId(Long topicId) {
+	MessageSeq seq = messageSeqDao.getByTopicId(topicId);
+	if (seq == null || seq.getRootMessage() == null) {
+	    ForumService.log.error("A sequence information can not be found for topic ID:" + topicId);
+	    return null;
 	}
+	return seq.getRootMessage().getUid();
+    }
 
-	public ForumToolSession getSessionBySessionId(Long sessionId) {
-		return forumToolSessionDao.getBySessionId(sessionId);
-	}
+    public List getAuthoredTopics(Long forumUid) {
+	List list = messageDao.getTopicsFromAuthor(forumUid);
 
-	public Long getRootTopicId(Long topicId) {
-		MessageSeq seq = messageSeqDao.getByTopicId(topicId);
-		if (seq == null || seq.getRootMessage() == null) {
-			ForumService.log.error("A sequence information can not be found for topic ID:" + topicId);
-			return null;
-		}
-		return seq.getRootMessage().getUid();
+	TreeMap<Date, Message> map = new TreeMap<Date, Message>(new DateComparator());
+	// get all the topics skipping ones with a tool session (we may be editing in monitor) and sort by create date
+	Iterator iter = list.iterator();
+	while (iter.hasNext()) {
+	    Message topic = (Message) iter.next();
+	    if (topic.getToolSession() == null) {
+		map.put(topic.getCreated(), topic);
+	    }
 	}
+	return MessageDTO.getMessageDTO(new ArrayList<Message>(map.values()));
+    }
 
-	public List getAuthoredTopics(Long forumUid) {
-		List list = messageDao.getTopicsFromAuthor(forumUid);
-
-		TreeMap<Date, Message> map = new TreeMap<Date, Message>(new DateComparator());
-		// get all the topics skipping ones with a tool session (we may be editing in monitor) and sort by create date
-		Iterator iter = list.iterator();
-		while (iter.hasNext()) {
-			Message topic = (Message) iter.next();
-			if (topic.getToolSession() == null) {
-				map.put(topic.getCreated(), topic);
-			}
-		}
-		return MessageDTO.getMessageDTO(new ArrayList<Message>(map.values()));
+    public Long getToolDefaultContentIdBySignature(String toolSignature) {
+	Long contentId = null;
+	contentId = new Long(toolService.getToolDefaultContentIdBySignature(toolSignature));
+	if (contentId == null) {
+	    String error = "Could not retrieve default content id for this tool";
+	    ForumService.log.error(error);
+	    throw new ForumException(error);
 	}
+	return contentId;
+    }
 
-	public Long getToolDefaultContentIdBySignature(String toolSignature) {
-		Long contentId = null;
-		contentId = new Long(toolService.getToolDefaultContentIdBySignature(toolSignature));
-		if (contentId == null) {
-			String error = "Could not retrieve default content id for this tool";
-			ForumService.log.error(error);
-			throw new ForumException(error);
-		}
-		return contentId;
-	}
+    public List getSessionsByContentId(Long contentID) {
+	return forumToolSessionDao.getByContentId(contentID);
+    }
 
-	public List getSessionsByContentId(Long contentID) {
-		return forumToolSessionDao.getByContentId(contentID);
-	}
+    public List getUsersBySessionId(Long sessionID) {
+	return forumUserDao.getBySessionId(sessionID);
+    }
 
-	public List getUsersBySessionId(Long sessionID) {
-		return forumUserDao.getBySessionId(sessionID);
-	}
+    public List getMessagesByUserUid(Long userId, Long sessionId) {
+	List list = messageDao.getByUserAndSession(userId, sessionId);
 
-	public List getMessagesByUserUid(Long userId, Long sessionId) {
-		List list = messageDao.getByUserAndSession(userId, sessionId);
+	return MessageDTO.getMessageDTO(list);
+    }
 
-		return MessageDTO.getMessageDTO(list);
-	}
+    public ForumUser getUser(Long userUid) {
+	return forumUserDao.getByUid(userUid);
+    }
 
-	public ForumUser getUser(Long userUid) {
-		return forumUserDao.getByUid(userUid);
+    public void releaseMarksForSession(Long sessionID) {
+	// udate release mark date for each message.
+	List list = messageDao.getBySession(sessionID);
+	Iterator iter = list.iterator();
+	ForumToolSession session = forumToolSessionDao.getBySessionId(sessionID);
+	Forum forum = session.getForum();
+	boolean notifyLearnersOnMarkRelease = getEventNotificationService().eventExists(ForumConstants.TOOL_SIGNATURE,
+		ForumConstants.EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE, forum.getContentId());
+	Map<Long, StringBuilder> notificationMessages = null;
+	Object[] notificationMessageParameters = null;
+	if (notifyLearnersOnMarkRelease) {
+	    notificationMessages = new TreeMap<Long, StringBuilder>();
+	    notificationMessageParameters = new Object[3];
 	}
 
-	public void releaseMarksForSession(Long sessionID) {
-		//udate release mark date for each message.
-		List list = messageDao.getBySession(sessionID);
-		Iterator iter = list.iterator();
-		ForumToolSession session = forumToolSessionDao.getBySessionId(sessionID);
-		Forum forum = session.getForum();
-		boolean notifyLearnersOnMarkRelease = getEventNotificationService().eventExists(ForumConstants.TOOL_SIGNATURE,
-				ForumConstants.EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE, forum.getContentId());
-		Map<Long, StringBuilder> notificationMessages = null;
-		Object[] notificationMessageParameters = null;
+	while (iter.hasNext()) {
+	    Message msg = (Message) iter.next();
+	    ForumReport report = msg.getReport();
+	    if (report != null) {
+		report.setDateMarksReleased(new Date());
 		if (notifyLearnersOnMarkRelease) {
-			notificationMessages = new TreeMap<Long, StringBuilder>();
-			notificationMessageParameters = new Object[3];
+		    ForumUser user = msg.getCreatedBy();
+		    StringBuilder notificationMessage = notificationMessages.get(user.getUserId());
+		    if (notificationMessage == null) {
+			notificationMessage = new StringBuilder();
+		    }
+		    notificationMessageParameters[0] = msg.getSubject();
+		    notificationMessageParameters[1] = msg.getUpdated();
+		    notificationMessageParameters[2] = report.getMark();
+		    notificationMessage.append(getLocalisedMessage("event.mark.release.mark",
+			    notificationMessageParameters));
+		    notificationMessages.put(user.getUserId(), notificationMessage);
 		}
+	    }
+	    messageDao.saveOrUpdate(msg);
+	}
+	if (notifyLearnersOnMarkRelease) {
+	    notificationMessageParameters = new Object[1];
+	    for (Long userID : notificationMessages.keySet()) {
+		notificationMessageParameters[0] = notificationMessages.get(userID).toString();
+		getEventNotificationService().triggerForSingleUser(ForumConstants.TOOL_SIGNATURE,
+			ForumConstants.EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE, forum.getContentId(), userID,
+			notificationMessageParameters);
+	    }
+	}
 
-		while (iter.hasNext()) {
-			Message msg = (Message) iter.next();
-			ForumReport report = msg.getReport();
-			if (report != null) {
-				report.setDateMarksReleased(new Date());
-				if (notifyLearnersOnMarkRelease) {
-					ForumUser user = msg.getCreatedBy();
-					StringBuilder notificationMessage = notificationMessages.get(user.getUserId());
-					if (notificationMessage == null) {
-						notificationMessage = new StringBuilder();
-					}
-					notificationMessageParameters[0] = msg.getSubject();
-					notificationMessageParameters[1] = msg.getUpdated();
-					notificationMessageParameters[2] = report.getMark();
-					notificationMessage.append(getLocalisedMessage("event.mark.release.mark", notificationMessageParameters));
-					notificationMessages.put(user.getUserId(), notificationMessage);
-				}
-			}
-			messageDao.saveOrUpdate(msg);
-		}
-		if (notifyLearnersOnMarkRelease) {
-			notificationMessageParameters = new Object[1];
-			for (Long userID : notificationMessages.keySet()) {
-				notificationMessageParameters[0] = notificationMessages.get(userID).toString();
-				getEventNotificationService().triggerForSingleUser(ForumConstants.TOOL_SIGNATURE,
-						ForumConstants.EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE, forum.getContentId(), userID,
-						notificationMessageParameters);
-			}
-		}
+	// update session to set MarkRelease flag.
+	session.setMarkReleased(true);
+	forumToolSessionDao.saveOrUpdate(session);
 
-		//update session to set MarkRelease flag.
-		session.setMarkReleased(true);
-		forumToolSessionDao.saveOrUpdate(session);
+    }
 
-	}
+    public void finishUserSession(ForumUser currentUser) {
+	currentUser.setSessionFinished(true);
+	forumUserDao.save(currentUser);
+    }
 
-	public void finishUserSession(ForumUser currentUser) {
-		currentUser.setSessionFinished(true);
-		forumUserDao.save(currentUser);
+    // ***************************************************************************************************************
+    // Private methods
+    // ***************************************************************************************************************
+    /**
+     * @param map
+     * @return
+     */
+    private List getSortedMessageDTO(SortedMap<MessageSeq, Message> map) {
+	Iterator iter;
+	MessageSeq msgSeq;
+	List<MessageDTO> msgDtoList = new ArrayList<MessageDTO>();
+	iter = map.entrySet().iterator();
+	while (iter.hasNext()) {
+	    Map.Entry entry = (Entry) iter.next();
+	    msgSeq = (MessageSeq) entry.getKey();
+	    MessageDTO dto = MessageDTO.getMessageDTO((Message) entry.getValue());
+	    dto.setLevel(msgSeq.getMessageLevel());
+	    msgDtoList.add(dto);
 	}
+	return msgDtoList;
+    }
 
-	//***************************************************************************************************************
-	// Private methods
-	//***************************************************************************************************************
-	/**
-	 * @param map
-	 * @return
-	 */
-	private List getSortedMessageDTO(SortedMap<MessageSeq, Message> map) {
-		Iterator iter;
-		MessageSeq msgSeq;
-		List<MessageDTO> msgDtoList = new ArrayList<MessageDTO>();
-		iter = map.entrySet().iterator();
-		while (iter.hasNext()) {
-			Map.Entry entry = (Entry) iter.next();
-			msgSeq = (MessageSeq) entry.getKey();
-			MessageDTO dto = MessageDTO.getMessageDTO((Message) entry.getValue());
-			dto.setLevel(msgSeq.getMessageLevel());
-			msgDtoList.add(dto);
-		}
-		return msgDtoList;
+    /**
+     * 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 = getForumToolContentHandler().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;
+    }
 
-	/**
-	* 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 = getForumToolContentHandler().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 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 {
+	ICredentials credentials = new SimpleCredentials(forumToolContentHandler.getRepositoryUser(),
+		forumToolContentHandler.getRepositoryId());
+	try {
+	    ITicket ticket = repositoryService.login(credentials, forumToolContentHandler.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());
 	}
+    }
 
-	/**
-	 * 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 {
-		ICredentials credentials = new SimpleCredentials(forumToolContentHandler.getRepositoryUser(), forumToolContentHandler
-				.getRepositoryId());
-		try {
-			ITicket ticket = repositoryService.login(credentials, forumToolContentHandler.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());
-		}
+    private Forum getDefaultForum() {
+	Long defaultForumId = getToolDefaultContentIdBySignature(ForumConstants.TOOL_SIGNATURE);
+	Forum defaultForum = getForumByContentId(defaultForumId);
+	if (defaultForum == null) {
+	    String error = "Could not retrieve default content record for this tool";
+	    ForumService.log.error(error);
+	    throw new ForumException(error);
 	}
 
-	private Forum getDefaultForum() {
-		Long defaultForumId = getToolDefaultContentIdBySignature(ForumConstants.TOOL_SIGNATURE);
-		Forum defaultForum = getForumByContentId(defaultForumId);
-		if (defaultForum == null) {
-			String error = "Could not retrieve default content record for this tool";
-			ForumService.log.error(error);
-			throw new ForumException(error);
-		}
+	return defaultForum;
 
-		return defaultForum;
+    }
 
-	}
+    public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId,
+	    String entryText) {
+	return coreNotebookService.createNotebookEntry(sessionId, notebookToolType, toolSignature, userId, "",
+		entryText);
+    }
 
-	public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId,
-			String entryText) {
-		return coreNotebookService.createNotebookEntry(sessionId, notebookToolType, toolSignature, userId, "", entryText);
+    public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID) {
+	List<NotebookEntry> list = coreNotebookService.getEntry(sessionId, idType, signature, userID);
+	if (list == null || list.isEmpty()) {
+	    return null;
+	} else {
+	    return list.get(0);
 	}
+    }
 
-	public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID) {
-		List<NotebookEntry> list = coreNotebookService.getEntry(sessionId, idType, signature, userID);
-		if (list == null || list.isEmpty()) {
-			return null;
-		}
-		else {
-			return list.get(0);
-		}
+    /**
+     * @param notebookEntry
+     */
+    public void updateEntry(NotebookEntry notebookEntry) {
+	coreNotebookService.updateEntry(notebookEntry);
+    }
+
+    // ***************************************************************************************************************
+    // ToolContentManager and ToolSessionManager methods
+    // ***************************************************************************************************************
+    public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException {
+	if (toContentId == null) {
+	    throw new ToolException("Failed to create the ForumFiles tool seession");
 	}
 
-	/**
-	 * @param notebookEntry
-	 */
-	public void updateEntry(NotebookEntry notebookEntry) {
-		coreNotebookService.updateEntry(notebookEntry);
+	Forum fromContent = null;
+	if (fromContentId != null) {
+	    fromContent = forumDao.getByContentId(fromContentId);
 	}
+	if (fromContent == null) {
+	    fromContent = getDefaultForum();
+	}
 
-	//***************************************************************************************************************
-	// ToolContentManager and ToolSessionManager methods
-	//***************************************************************************************************************
-	public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException {
-		if (toContentId == null) {
-			throw new ToolException("Failed to create the ForumFiles tool seession");
-		}
+	Forum toContent = Forum.newInstance(fromContent, toContentId, forumToolContentHandler);
+	forumDao.saveOrUpdate(toContent);
 
-		Forum fromContent = null;
-		if (fromContentId != null) {
-			fromContent = forumDao.getByContentId(fromContentId);
+	// save topics in this forum, only save the author created topic!!! and reset its reply number to zero.
+	Set topics = toContent.getMessages();
+	if (topics != null) {
+	    Iterator iter = topics.iterator();
+	    while (iter.hasNext()) {
+		Message msg = (Message) iter.next();
+		// set this message forum Uid as toContent
+		if (!msg.getIsAuthored()) {
+		    continue;
 		}
-		if (fromContent == null) {
-			fromContent = getDefaultForum();
-		}
+		msg.setReplyNumber(0);
+		// msg.setCreated(new Date()); // need to keep the original create date to maintain correct order
+		msg.setUpdated(new Date());
+		msg.setLastReplyDate(new Date());
+		msg.setHideFlag(false);
+		msg.setForum(toContent);
+		createRootTopic(toContent.getUid(), (ForumToolSession) null, msg);
+	    }
+	}
 
-		Forum toContent = Forum.newInstance(fromContent, toContentId, forumToolContentHandler);
-		forumDao.saveOrUpdate(toContent);
+    }
 
-		//save topics in this forum, only save the author created topic!!! and reset its reply number to zero.
-		Set topics = toContent.getMessages();
-		if (topics != null) {
-			Iterator iter = topics.iterator();
-			while (iter.hasNext()) {
-				Message msg = (Message) iter.next();
-				//set this message forum Uid as toContent
-				if (!msg.getIsAuthored()) {
-					continue;
-				}
-				msg.setReplyNumber(0);
-				// msg.setCreated(new Date());  // need to keep the original create date to maintain correct order
-				msg.setUpdated(new Date());
-				msg.setLastReplyDate(new Date());
-				msg.setHideFlag(false);
-				msg.setForum(toContent);
-				createRootTopic(toContent.getUid(), (ForumToolSession) null, msg);
-			}
-		}
-
+    public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException {
+	Forum forum = forumDao.getByContentId(toolContentId);
+	if (forum == null) {
+	    throw new ToolException("No found tool content by given content ID:" + toolContentId);
 	}
+	forum.setDefineLater(value);
+	forum.setContentInUse(false);
+    }
 
-	public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-		Forum forum = forumDao.getByContentId(toolContentId);
-		if (forum == null) {
-			throw new ToolException("No found tool content by given content ID:" + toolContentId);
-		}
-		forum.setDefineLater(value);
-		forum.setContentInUse(false);
+    public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException {
+	Forum forum = forumDao.getByContentId(toolContentId);
+	if (forum == null) {
+	    throw new ToolException("No found tool content by given content ID:" + toolContentId);
 	}
+	forum.setRunOffline(value);
 
-	public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException {
-		Forum forum = forumDao.getByContentId(toolContentId);
-		if (forum == null) {
-			throw new ToolException("No found tool content by given content ID:" + toolContentId);
-		}
-		forum.setRunOffline(value);
+    }
 
+    public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException,
+	    ToolException {
+	Forum forum = forumDao.getByContentId(toolContentId);
+	if (removeSessionData) {
+	    List list = forumToolSessionDao.getByContentId(toolContentId);
+	    Iterator iter = list.iterator();
+	    while (iter.hasNext()) {
+		ForumToolSession session = (ForumToolSession) iter.next();
+		forumToolSessionDao.delete(session);
+	    }
 	}
+	forumDao.delete(forum);
+    }
 
-	public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, ToolException {
-		Forum forum = forumDao.getByContentId(toolContentId);
-		if (removeSessionData) {
-			List list = forumToolSessionDao.getByContentId(toolContentId);
-			Iterator iter = list.iterator();
-			while (iter.hasNext()) {
-				ForumToolSession session = (ForumToolSession) iter.next();
-				forumToolSessionDao.delete(session);
-			}
-		}
-		forumDao.delete(forum);
+    /**
+     * Export the XML fragment for the tool's content, along with any files needed for the content.
+     * 
+     * @throws DataMissingException
+     *                 if no tool content matches the toolSessionId
+     * @throws ToolException
+     *                 if any other error occurs
+     */
+
+    public void exportToolContent(Long toolContentId, String rootPath) throws DataMissingException, ToolException {
+	Forum toolContentObj = forumDao.getByContentId(toolContentId);
+	if (toolContentObj == null) {
+	    toolContentObj = getDefaultForum();
 	}
+	if (toolContentObj == null) {
+	    throw new DataMissingException("Unable to find default content for the forum tool");
+	}
 
-	/**
-	 * Export the XML fragment for the tool's content, along with any files needed
-	 * for the content.
-	 * @throws DataMissingException if no tool content matches the toolSessionId 
-	 * @throws ToolException if any other error occurs
-	 */
-
-	public void exportToolContent(Long toolContentId, String rootPath) throws DataMissingException, ToolException {
-		Forum toolContentObj = forumDao.getByContentId(toolContentId);
-		if (toolContentObj == null) {
-			toolContentObj = getDefaultForum();
-		}
-		if (toolContentObj == null) {
-			throw new DataMissingException("Unable to find default content for the forum tool");
-		}
-
-		//set ResourceToolContentHandler as null to avoid copy file node in repository again.
-		toolContentObj = Forum.newInstance(toolContentObj, toolContentId, null);
-		toolContentObj.setToolContentHandler(null);
-		toolContentObj.setCreatedBy(null);
-		Set<Message> items = toolContentObj.getMessages();
-		Set<Message> authorItems = new HashSet<Message>();
-		for (Message item : items) {
-			if (item.getIsAuthored()) {
-				authorItems.add(item);
-				item.setCreatedBy(null);
-				item.setModifiedBy(null);
-				item.setToolSession(null);
-				item.setForum(null);
-				item.setToolContentHandler(null);
-				item.setReport(null);
-				item.setReplyNumber(0);
-				item.setParent(null);
-				item.setSessionClones(null);
-			}
-		}
-		toolContentObj.setMessages(authorItems);
-		try {
-			exportContentService.registerFileClassForExport(Attachment.class.getName(), "fileUuid", "fileVersionId");
-			exportContentService.exportToolContent(toolContentId, toolContentObj, forumToolContentHandler, rootPath);
-		}
-		catch (ExportToolContentException e) {
-			throw new ToolException(e);
-		}
+	// set ResourceToolContentHandler as null to avoid copy file node in repository again.
+	toolContentObj = Forum.newInstance(toolContentObj, toolContentId, null);
+	toolContentObj.setToolContentHandler(null);
+	toolContentObj.setCreatedBy(null);
+	Set<Message> items = toolContentObj.getMessages();
+	Set<Message> authorItems = new HashSet<Message>();
+	for (Message item : items) {
+	    if (item.getIsAuthored()) {
+		authorItems.add(item);
+		item.setCreatedBy(null);
+		item.setModifiedBy(null);
+		item.setToolSession(null);
+		item.setForum(null);
+		item.setToolContentHandler(null);
+		item.setReport(null);
+		item.setReplyNumber(0);
+		item.setParent(null);
+		item.setSessionClones(null);
+	    }
 	}
+	toolContentObj.setMessages(authorItems);
+	try {
+	    exportContentService.registerFileClassForExport(Attachment.class.getName(), "fileUuid", "fileVersionId");
+	    exportContentService.exportToolContent(toolContentId, toolContentObj, forumToolContentHandler, rootPath);
+	} catch (ExportToolContentException e) {
+	    throw new ToolException(e);
+	}
+    }
 
-	/**
-	 * Import the XML fragment for the tool's content, along with any files needed
-	 * for the content.
-	 * @throws ToolException if any other error occurs
-	 */
-	public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath, String fromVersion,
-			String toVersion) throws ToolException {
+    /**
+     * Import the XML fragment for the tool's content, along with any files needed for the content.
+     * 
+     * @throws ToolException
+     *                 if any other error occurs
+     */
+    public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath, String fromVersion,
+	    String toVersion) throws ToolException {
 
-		try {
-			exportContentService.registerFileClassForImport(Attachment.class.getName(), "fileUuid", "fileVersionId", "fileName",
-					"fileType", null, null);
+	try {
+	    exportContentService.registerFileClassForImport(Attachment.class.getName(), "fileUuid", "fileVersionId",
+		    "fileName", "fileType", null, null);
 
-			Object toolPOJO = exportContentService.importToolContent(toolContentPath, forumToolContentHandler, fromVersion,
-					toVersion);
-			if (!(toolPOJO instanceof Forum)) {
-				throw new ImportToolContentException("Import Forum tool content failed. Deserialized object is " + toolPOJO);
-			}
-			Forum toolContentObj = (Forum) toolPOJO;
+	    Object toolPOJO = exportContentService.importToolContent(toolContentPath, forumToolContentHandler,
+		    fromVersion, toVersion);
+	    if (!(toolPOJO instanceof Forum)) {
+		throw new ImportToolContentException("Import Forum tool content failed. Deserialized object is "
+			+ toolPOJO);
+	    }
+	    Forum toolContentObj = (Forum) toolPOJO;
 
-			//			reset it to new toolContentId
-			toolContentObj.setContentId(toolContentId);
-			ForumUser user = forumUserDao.getByUserId(new Long(newUserUid.longValue()));
-			if (user == null) {
-				user = new ForumUser();
-				UserDTO sysUser = ((User) userManagementService.findById(User.class, newUserUid)).getUserDTO();
-				user.setFirstName(sysUser.getFirstName());
-				user.setLastName(sysUser.getLastName());
-				user.setLoginName(sysUser.getLogin());
-				user.setUserId(new Long(newUserUid.longValue()));
-				this.createUser(user);
-			}
-			toolContentObj.setCreatedBy(user);
-			//save forum first
-			forumDao.saveOrUpdate(toolContentObj);
+	    // reset it to new toolContentId
+	    toolContentObj.setContentId(toolContentId);
+	    ForumUser user = forumUserDao.getByUserId(new Long(newUserUid.longValue()));
+	    if (user == null) {
+		user = new ForumUser();
+		UserDTO sysUser = ((User) userManagementService.findById(User.class, newUserUid)).getUserDTO();
+		user.setFirstName(sysUser.getFirstName());
+		user.setLastName(sysUser.getLastName());
+		user.setLoginName(sysUser.getLogin());
+		user.setUserId(new Long(newUserUid.longValue()));
+		this.createUser(user);
+	    }
+	    toolContentObj.setCreatedBy(user);
+	    // save forum first
+	    forumDao.saveOrUpdate(toolContentObj);
 
-			//save all authoring message one by one.
-			//reset all resourceItem createBy user
-			Set<Message> items = toolContentObj.getMessages();
-			for (Message item : items) {
-				item.setCreatedBy(user);
-				item.setIsAuthored(true);
-				item.setForum(toolContentObj);
-				item.setSessionClones(new HashSet());
-				createRootTopic(toolContentObj.getUid(), (ForumToolSession) null, item);
-			}
-		}
-		catch (ImportToolContentException e) {
-			throw new ToolException(e);
-		}
+	    // save all authoring message one by one.
+	    // reset all resourceItem createBy user
+	    Set<Message> items = toolContentObj.getMessages();
+	    for (Message item : items) {
+		item.setCreatedBy(user);
+		item.setIsAuthored(true);
+		item.setForum(toolContentObj);
+		item.setSessionClones(new HashSet());
+		createRootTopic(toolContentObj.getUid(), (ForumToolSession) null, item);
+	    }
+	} catch (ImportToolContentException e) {
+	    throw new ToolException(e);
 	}
+    }
 
-	/** Get the definitions for possible output for an activity, based on the toolContentId. These may be definitions that are always
-	* available for the tool (e.g. number of marks for Multiple Choice) or a custom definition created for a particular activity
-	* such as the answer to the third question contains the word Koala and hence the need for the toolContentId
-	* @return SortedMap of ToolOutputDefinitions with the key being the name of each definition
-	*/
-	public SortedMap<String, ToolOutputDefinition> getToolOutputDefinitions(Long toolContentId) throws ToolException {
-		Forum forum = getForum(toolContentId);
-		if (forum == null) {
-			forum = getDefaultForum();
-		}
-		return getForumOutputFactory().getToolOutputDefinitions(forum);
+    /**
+     * Get the definitions for possible output for an activity, based on the toolContentId. These may be definitions
+     * that are always available for the tool (e.g. number of marks for Multiple Choice) or a custom definition created
+     * for a particular activity such as the answer to the third question contains the word Koala and hence the need for
+     * the toolContentId
+     * 
+     * @return SortedMap of ToolOutputDefinitions with the key being the name of each definition
+     */
+    public SortedMap<String, ToolOutputDefinition> getToolOutputDefinitions(Long toolContentId) throws ToolException {
+	Forum forum = getForumByContentId(toolContentId);
+	if (forum == null) {
+	    forum = getDefaultForum();
+	} // If there are no user added conditions, the default condition will be added in the output factory. It
+	// also
+	// needs to be persisted.
+	boolean defaultConditionToBeAdded = forum.getConditions().isEmpty();
+	SortedMap<String, ToolOutputDefinition> map = getForumOutputFactory().getToolOutputDefinitions(forum);
+	if (defaultConditionToBeAdded && !forum.getConditions().isEmpty()) {
+	    updateForum(forum);
 	}
+	return map;
+    }
 
-	/** @see org.lamsfoundation.lams.tool.ToolSessionManager#createToolSession(java.lang.Long, java.lang.String, java.lang.Long) */
-	public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException {
-		ForumToolSession session = new ForumToolSession();
-		session.setSessionId(toolSessionId);
-		session.setSessionName(toolSessionName);
-		Forum forum = forumDao.getByContentId(toolContentId);
-		session.setForum(forum);
+    /**
+     * @see org.lamsfoundation.lams.tool.ToolSessionManager#createToolSession(java.lang.Long, java.lang.String,
+     *      java.lang.Long)
+     */
+    public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException {
+	ForumToolSession session = new ForumToolSession();
+	session.setSessionId(toolSessionId);
+	session.setSessionName(toolSessionName);
+	Forum forum = forumDao.getByContentId(toolContentId);
+	session.setForum(forum);
 
-		//		also clone author created topic from this forum tool content!!!
-		//		this can avoid topic record information conflict when multiple sessions are against same tool content
-		//		for example, the reply number maybe various for different sessions.
-		ForumService.log.debug("Clone tool content [" + forum.getContentId() + "] topics for session [" + session.getSessionId()
-				+ "]");
-		Set<Message> contentTopics = forum.getMessages();
-		if (contentTopics != null && contentTopics.size() > 0) {
-			for (Message msg : contentTopics) {
-				if (msg.getIsAuthored() && msg.getToolSession() == null) {
-					Message newMsg = Message.newInstance(msg, forumToolContentHandler);
-					msg.getSessionClones().add(newMsg);
-					createRootTopic(forum.getContentId(), session, newMsg);
-				}
-			}
+	// also clone author created topic from this forum tool content!!!
+	// this can avoid topic record information conflict when multiple sessions are against same tool content
+	// for example, the reply number maybe various for different sessions.
+	ForumService.log.debug("Clone tool content [" + forum.getContentId() + "] topics for session ["
+		+ session.getSessionId() + "]");
+	Set<Message> contentTopics = forum.getMessages();
+	if (contentTopics != null && contentTopics.size() > 0) {
+	    for (Message msg : contentTopics) {
+		if (msg.getIsAuthored() && msg.getToolSession() == null) {
+		    Message newMsg = Message.newInstance(msg, forumToolContentHandler);
+		    msg.getSessionClones().add(newMsg);
+		    createRootTopic(forum.getContentId(), session, newMsg);
 		}
-		session.setStatus(ForumConstants.STATUS_CONTENT_COPYED);
-
-		forumToolSessionDao.saveOrUpdate(session);
-		ForumService.log.debug("tool session [" + session.getSessionId() + "] created.");
+	    }
 	}
+	session.setStatus(ForumConstants.STATUS_CONTENT_COPYED);
 
-	public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException {
-		if (toolSessionId == null) {
-			ForumService.log.error("Fail to leave tool Session based on null tool session id.");
-			throw new ToolException("Fail to remove tool Session based on null tool session id.");
-		}
-		if (learnerId == null) {
-			ForumService.log.error("Fail to leave tool Session based on null learner.");
-			throw new ToolException("Fail to remove tool Session based on null learner.");
-		}
+	forumToolSessionDao.saveOrUpdate(session);
+	ForumService.log.debug("tool session [" + session.getSessionId() + "] created.");
+    }
 
-		ForumToolSession session = forumToolSessionDao.getBySessionId(toolSessionId);
-		if (session != null) {
-			forumToolSessionDao.saveOrUpdate(session);
-		}
-		else {
-			ForumService.log.error("Fail to leave tool Session.Could not find submit file " + "session by given session id: "
-					+ toolSessionId);
-			throw new DataMissingException("Fail to leave tool Session."
-					+ "Could not find submit file session by given session id: " + toolSessionId);
-		}
-		return learnerService.completeToolSession(toolSessionId, learnerId);
+    public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException {
+	if (toolSessionId == null) {
+	    ForumService.log.error("Fail to leave tool Session based on null tool session id.");
+	    throw new ToolException("Fail to remove tool Session based on null tool session id.");
 	}
-
-	public ToolSessionExportOutputData exportToolSession(Long toolSessionId) throws DataMissingException, ToolException {
-		return null;
+	if (learnerId == null) {
+	    ForumService.log.error("Fail to leave tool Session based on null learner.");
+	    throw new ToolException("Fail to remove tool Session based on null learner.");
 	}
 
-	public ToolSessionExportOutputData exportToolSession(List toolSessionIds) throws DataMissingException, ToolException {
-		return null;
+	ForumToolSession session = forumToolSessionDao.getBySessionId(toolSessionId);
+	if (session != null) {
+	    forumToolSessionDao.saveOrUpdate(session);
+	} else {
+	    ForumService.log.error("Fail to leave tool Session.Could not find submit file "
+		    + "session by given session id: " + toolSessionId);
+	    throw new DataMissingException("Fail to leave tool Session."
+		    + "Could not find submit file session by given session id: " + toolSessionId);
 	}
+	return learnerService.completeToolSession(toolSessionId, learnerId);
+    }
 
-	public void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException {
-		forumToolSessionDao.delete(toolSessionId);
-	}
+    public ToolSessionExportOutputData exportToolSession(Long toolSessionId) throws DataMissingException, ToolException {
+	return null;
+    }
 
-	/** 
-	 * Get the tool output for the given tool output names.
-	 * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.util.List<String>, java.lang.Long, java.lang.Long)
-	 */
-	public SortedMap<String, ToolOutput> getToolOutput(List<String> names, Long toolSessionId, Long learnerId) {
+    public ToolSessionExportOutputData exportToolSession(List toolSessionIds) throws DataMissingException,
+	    ToolException {
+	return null;
+    }
 
-		return forumOutputFactory.getToolOutput(names, this, toolSessionId, learnerId);
+    public void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException {
+	forumToolSessionDao.delete(toolSessionId);
+    }
 
-	}
+    /**
+     * Get the tool output for the given tool output names.
+     * 
+     * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.util.List<String>, java.lang.Long,
+     *      java.lang.Long)
+     */
+    public SortedMap<String, ToolOutput> getToolOutput(List<String> names, Long toolSessionId, Long learnerId) {
 
-	/** 
-	 * Get the tool output for the given tool output name.
-	 * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.lang.String, java.lang.Long, java.lang.Long)
-	 */
-	public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) {
-		return forumOutputFactory.getToolOutput(name, this, toolSessionId, learnerId);
-	}
+	return forumOutputFactory.getToolOutput(names, this, toolSessionId, learnerId);
 
-	/* (non-Javadoc)
-	 * @see org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService#getDefaultContent(java.lang.Long)
-	 */
-	public Forum getDefaultContent(Long contentID) {
-		if (contentID == null) {
-			String error = "Could not retrieve default content id for Forum tool";
-			ForumService.log.error(error);
-			throw new ForumException(error);
-		}
+    }
 
-		Forum defaultContent = getDefaultForum();
-		//get default content by given ID.
-		Forum content = new Forum();
-		content = Forum.newInstance(defaultContent, contentID, forumToolContentHandler);
+    /**
+     * Get the tool output for the given tool output name.
+     * 
+     * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.lang.String, java.lang.Long,
+     *      java.lang.Long)
+     */
+    public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) {
+	return forumOutputFactory.getToolOutput(name, this, toolSessionId, learnerId);
+    }
 
-		Set topics = content.getMessages();
-		if (topics != null) {
-			Iterator iter = topics.iterator();
-			while (iter.hasNext()) {
-				Message msg = (Message) iter.next();
-				//clear message forum so that they can be saved when persistent happens
-				msg.setForum(null);
-			}
-		}
-
-		return content;
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService#getDefaultContent(java.lang.Long)
+     */
+    public Forum getDefaultContent(Long contentID) {
+	if (contentID == null) {
+	    String error = "Could not retrieve default content id for Forum tool";
+	    ForumService.log.error(error);
+	    throw new ForumException(error);
 	}
 
-	public List<MessageDTO> getAllTopicsFromSession(Long sessionID) {
-		return MessageDTO.getMessageDTO(messageDao.getBySession(sessionID));
+	Forum defaultContent = getDefaultForum();
+	// get default content by given ID.
+	Forum content = new Forum();
+	content = Forum.newInstance(defaultContent, contentID, forumToolContentHandler);
+
+	Set topics = content.getMessages();
+	if (topics != null) {
+	    Iterator iter = topics.iterator();
+	    while (iter.hasNext()) {
+		Message msg = (Message) iter.next();
+		// clear message forum so that they can be saved when persistent happens
+		msg.setForum(null);
+	    }
 	}
 
-	/* ===============Methods implemented from ToolContentImport102Manager =============== */
+	return content;
+    }
 
-	/**
-	 * Import the data for a 1.0.2 Forum
-	 */
-	public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) {
-		Date now = new Date();
-		Forum toolContentObj = new Forum();
+    public List<MessageDTO> getAllTopicsFromSession(Long sessionID) {
+	return MessageDTO.getMessageDTO(messageDao.getBySession(sessionID));
+    }
 
-		try {
+    /* ===============Methods implemented from ToolContentImport102Manager =============== */
 
-			toolContentObj.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
+    /**
+     * Import the data for a 1.0.2 Forum
+     */
+    public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) {
+	Date now = new Date();
+	Forum toolContentObj = new Forum();
 
-			toolContentObj.setAllowAnonym(Boolean.FALSE);
-			toolContentObj.setAllowEdit(Boolean.TRUE); // this is the default value
-			toolContentObj.setAllowNewTopic(Boolean.TRUE);
-			toolContentObj.setAllowRichEditor(Boolean.FALSE);
-			toolContentObj.setAllowUpload(Boolean.TRUE); // this is the default value
-			toolContentObj.setContentId(toolContentId);
-			toolContentObj.setContentInUse(Boolean.FALSE);
-			toolContentObj.setCreated(now);
-			toolContentObj.setDefineLater(Boolean.FALSE);
-			toolContentObj.setInstructions(WebUtil.convertNewlines((String) importValues
-					.get(ToolContentImport102Manager.CONTENT_BODY)));
-			toolContentObj.setLimitedChar(5000); // this is the default value
-			toolContentObj.setReflectOnActivity(Boolean.FALSE);
-			toolContentObj.setReflectInstructions(null);
+	try {
 
-			// lockOnFinsh = ! isReusable
-			Boolean bool = WDDXProcessor.convertToBoolean(importValues, ToolContentImport102Manager.CONTENT_REUSABLE);
-			toolContentObj.setLockWhenFinished(bool != null ? !bool.booleanValue() : false);
-			toolContentObj.setMaximumReply(0);
-			toolContentObj.setMinimumReply(0);
-			toolContentObj.setOfflineInstructions(null);
-			toolContentObj.setOnlineInstructions(null);
-			toolContentObj.setRunOffline(Boolean.FALSE);
-			toolContentObj.setUpdated(now);
+	    toolContentObj.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
 
-			// unused entries from 1.0.2
-			// isNewTopicAllowed  - not actually used in 1.0.2
-			// durationInDays - no equivalent in 2.0
-			// isPostingModerated - no equivalent in 2.0
-			// isPostingNotified - no equivalent in 2.0
-			// contentShowUser - no equivalent in 2.0
-			// isHTML - no equivalent in 2.0
-			// terminationType=moderator - no equivalent in 2.0
+	    toolContentObj.setAllowAnonym(Boolean.FALSE);
+	    toolContentObj.setAllowEdit(Boolean.TRUE); // this is the default value
+	    toolContentObj.setAllowNewTopic(Boolean.TRUE);
+	    toolContentObj.setAllowRichEditor(Boolean.FALSE);
+	    toolContentObj.setAllowUpload(Boolean.TRUE); // this is the default value
+	    toolContentObj.setContentId(toolContentId);
+	    toolContentObj.setContentInUse(Boolean.FALSE);
+	    toolContentObj.setCreated(now);
+	    toolContentObj.setDefineLater(Boolean.FALSE);
+	    toolContentObj.setInstructions(WebUtil.convertNewlines((String) importValues
+		    .get(ToolContentImport102Manager.CONTENT_BODY)));
+	    toolContentObj.setLimitedChar(5000); // this is the default value
+	    toolContentObj.setReflectOnActivity(Boolean.FALSE);
+	    toolContentObj.setReflectInstructions(null);
 
-			ForumUser forumUser = new ForumUser();
-			forumUser.setUserId(new Long(user.getUserID().longValue()));
-			forumUser.setFirstName(user.getFirstName());
-			forumUser.setLastName(user.getLastName());
-			forumUser.setLoginName(user.getLogin());
-			createUser(forumUser);
-			toolContentObj.setCreatedBy(forumUser);
+	    // lockOnFinsh = ! isReusable
+	    Boolean bool = WDDXProcessor.convertToBoolean(importValues, ToolContentImport102Manager.CONTENT_REUSABLE);
+	    toolContentObj.setLockWhenFinished(bool != null ? !bool.booleanValue() : false);
+	    toolContentObj.setMaximumReply(0);
+	    toolContentObj.setMinimumReply(0);
+	    toolContentObj.setOfflineInstructions(null);
+	    toolContentObj.setOnlineInstructions(null);
+	    toolContentObj.setRunOffline(Boolean.FALSE);
+	    toolContentObj.setUpdated(now);
 
-			// leave as empty, no need to set them to anything.
-			//toolContentObj.setAttachments(attachments);
-			forumDao.saveOrUpdate(toolContentObj);
+	    // unused entries from 1.0.2
+	    // isNewTopicAllowed - not actually used in 1.0.2
+	    // durationInDays - no equivalent in 2.0
+	    // isPostingModerated - no equivalent in 2.0
+	    // isPostingNotified - no equivalent in 2.0
+	    // contentShowUser - no equivalent in 2.0
+	    // isHTML - no equivalent in 2.0
+	    // terminationType=moderator - no equivalent in 2.0
 
-			// topics in the XML file are ordered using the "number" field, not in their order in the vector.
-			TreeMap<Integer, Map> messageMaps = new TreeMap<Integer, Map>();
-			Vector topics = (Vector) importValues.get(ToolContentImport102Manager.CONTENT_MB_TOPICS);
-			Date msgDate = null;
-			if (topics != null) {
-				Iterator iter = topics.iterator();
-				while (iter.hasNext()) {
-					Hashtable messageMap = (Hashtable) iter.next();
-					Integer order = WDDXProcessor.convertToInteger(messageMap,
-							ToolContentImport102Manager.CONTENT_MB_TOPIC_NUMBER);
-					messageMaps.put(order, messageMap);
-				}
+	    ForumUser forumUser = new ForumUser();
+	    forumUser.setUserId(new Long(user.getUserID().longValue()));
+	    forumUser.setFirstName(user.getFirstName());
+	    forumUser.setLastName(user.getLastName());
+	    forumUser.setLoginName(user.getLogin());
+	    createUser(forumUser);
+	    toolContentObj.setCreatedBy(forumUser);
 
-				iter = messageMaps.values().iterator();
-				while (iter.hasNext()) {
+	    // leave as empty, no need to set them to anything.
+	    // toolContentObj.setAttachments(attachments);
+	    forumDao.saveOrUpdate(toolContentObj);
 
-					Map messageMap = (Map) iter.next();
+	    // topics in the XML file are ordered using the "number" field, not in their order in the vector.
+	    TreeMap<Integer, Map> messageMaps = new TreeMap<Integer, Map>();
+	    Vector topics = (Vector) importValues.get(ToolContentImport102Manager.CONTENT_MB_TOPICS);
+	    Date msgDate = null;
+	    if (topics != null) {
+		Iterator iter = topics.iterator();
+		while (iter.hasNext()) {
+		    Hashtable messageMap = (Hashtable) iter.next();
+		    Integer order = WDDXProcessor.convertToInteger(messageMap,
+			    ToolContentImport102Manager.CONTENT_MB_TOPIC_NUMBER);
+		    messageMaps.put(order, messageMap);
+		}
 
-					Message message = new Message();
-					message.setIsAuthored(true);
+		iter = messageMaps.values().iterator();
+		while (iter.hasNext()) {
 
-					// topics are ordered by date, so I need to try to assign each entry a different date. Won't work if this is too quick.
-					if (msgDate != null) {
-						try {
-							Thread.sleep(1000);
-						}
-						catch (Exception e) {
-						}
-					}
-					msgDate = new Date();
+		    Map messageMap = (Map) iter.next();
 
-					message.setCreated(msgDate);
-					message.setCreatedBy(forumUser);
-					message.setUpdated(msgDate);
-					message.setLastReplyDate(msgDate);
-					message.setSubject((String) messageMap.get(ToolContentImport102Manager.CONTENT_TITLE));
-					message.setBody(WebUtil.convertNewlines((String) messageMap
-							.get(ToolContentImport102Manager.CONTENT_MB_TOPIC_MESSAGE)));
-					// ignore the old subject field - it wasn't updated by the old interface.
-					message.setHideFlag(Boolean.FALSE);
-					message.setIsAnonymous(Boolean.FALSE);
+		    Message message = new Message();
+		    message.setIsAuthored(true);
 
-					createRootTopic(toolContentObj.getUid(), (ForumToolSession) null, message);
-
-				}
+		    // topics are ordered by date, so I need to try to assign each entry a different date. Won't work if
+		    // this is too quick.
+		    if (msgDate != null) {
+			try {
+			    Thread.sleep(1000);
+			} catch (Exception e) {
 			}
+		    }
+		    msgDate = new Date();
 
+		    message.setCreated(msgDate);
+		    message.setCreatedBy(forumUser);
+		    message.setUpdated(msgDate);
+		    message.setLastReplyDate(msgDate);
+		    message.setSubject((String) messageMap.get(ToolContentImport102Manager.CONTENT_TITLE));
+		    message.setBody(WebUtil.convertNewlines((String) messageMap
+			    .get(ToolContentImport102Manager.CONTENT_MB_TOPIC_MESSAGE)));
+		    // ignore the old subject field - it wasn't updated by the old interface.
+		    message.setHideFlag(Boolean.FALSE);
+		    message.setIsAnonymous(Boolean.FALSE);
+
+		    createRootTopic(toolContentObj.getUid(), (ForumToolSession) null, message);
+
 		}
-		catch (WDDXProcessorConversionException e) {
-			ForumService.log.error("Unable to content for activity " + toolContentObj.getTitle()
-					+ "properly due to a WDDXProcessorConversionException.", e);
-			throw new ToolException("Invalid import data format for activity " + toolContentObj.getTitle()
-					+ "- WDDX caused an exception. Some data from the design will have been lost. See log for more details.");
-		}
+	    }
 
+	} catch (WDDXProcessorConversionException e) {
+	    ForumService.log.error("Unable to content for activity " + toolContentObj.getTitle()
+		    + "properly due to a WDDXProcessorConversionException.", e);
+	    throw new ToolException(
+		    "Invalid import data format for activity "
+			    + toolContentObj.getTitle()
+			    + "- WDDX caused an exception. Some data from the design will have been lost. See log for more details.");
 	}
 
-	/** Set the description, throws away the title value as this is not supported in 2.0 */
-	public void setReflectiveData(Long toolContentId, String title, String description) throws ToolException,
-			DataMissingException {
+    }
 
-		Forum toolContentObj = getForumByContentId(toolContentId);
-		if (toolContentObj == null) {
-			throw new DataMissingException("Unable to set reflective data titled " + title + " on activity toolContentId "
-					+ toolContentId + " as the tool content does not exist.");
-		}
+    /** Set the description, throws away the title value as this is not supported in 2.0 */
+    public void setReflectiveData(Long toolContentId, String title, String description) throws ToolException,
+	    DataMissingException {
 
-		toolContentObj.setReflectOnActivity(Boolean.TRUE);
-		toolContentObj.setReflectInstructions(description);
+	Forum toolContentObj = getForumByContentId(toolContentId);
+	if (toolContentObj == null) {
+	    throw new DataMissingException("Unable to set reflective data titled " + title
+		    + " on activity toolContentId " + toolContentId + " as the tool content does not exist.");
 	}
 
-	//***************************************************************************************************************
-	// Get / Set methods
-	//***************************************************************************************************************
-	public ILamsToolService getToolService() {
-		return toolService;
-	}
+	toolContentObj.setReflectOnActivity(Boolean.TRUE);
+	toolContentObj.setReflectInstructions(description);
+    }
 
-	public void setToolService(ILamsToolService toolService) {
-		this.toolService = toolService;
-	}
+    // ***************************************************************************************************************
+    // Get / Set methods
+    // ***************************************************************************************************************
+    public ILamsToolService getToolService() {
+	return toolService;
+    }
 
-	public AttachmentDao getAttachmentDao() {
-		return attachmentDao;
-	}
+    public void setToolService(ILamsToolService toolService) {
+	this.toolService = toolService;
+    }
 
-	public void setAttachmentDao(AttachmentDao attachmentDao) {
-		this.attachmentDao = attachmentDao;
-	}
+    public AttachmentDao getAttachmentDao() {
+	return attachmentDao;
+    }
 
-	public ForumDao getForumDao() {
-		return forumDao;
-	}
+    public void setAttachmentDao(AttachmentDao attachmentDao) {
+	this.attachmentDao = attachmentDao;
+    }
 
-	public void setForumDao(ForumDao forumDao) {
-		this.forumDao = forumDao;
-	}
+    public ForumDao getForumDao() {
+	return forumDao;
+    }
 
-	public MessageDao getMessageDao() {
-		return messageDao;
-	}
+    public void setForumDao(ForumDao forumDao) {
+	this.forumDao = forumDao;
+    }
 
-	public void setMessageDao(MessageDao messageDao) {
-		this.messageDao = messageDao;
-	}
+    public MessageDao getMessageDao() {
+	return messageDao;
+    }
 
-	public MessageSeqDao getMessageSeqDao() {
-		return messageSeqDao;
-	}
+    public void setMessageDao(MessageDao messageDao) {
+	this.messageDao = messageDao;
+    }
 
-	public void setMessageSeqDao(MessageSeqDao messageSeqDao) {
-		this.messageSeqDao = messageSeqDao;
-	}
+    public MessageSeqDao getMessageSeqDao() {
+	return messageSeqDao;
+    }
 
-	public ForumToolSessionDao getForumToolSessionDao() {
-		return forumToolSessionDao;
-	}
+    public void setMessageSeqDao(MessageSeqDao messageSeqDao) {
+	this.messageSeqDao = messageSeqDao;
+    }
 
-	public void setForumToolSessionDao(ForumToolSessionDao forumToolSessionDao) {
-		this.forumToolSessionDao = forumToolSessionDao;
-	}
+    public ForumToolSessionDao getForumToolSessionDao() {
+	return forumToolSessionDao;
+    }
 
-	public ForumUserDao getForumUserDao() {
-		return forumUserDao;
-	}
+    public void setForumToolSessionDao(ForumToolSessionDao forumToolSessionDao) {
+	this.forumToolSessionDao = forumToolSessionDao;
+    }
 
-	public void setForumUserDao(ForumUserDao forumUserDao) {
-		this.forumUserDao = forumUserDao;
-	}
+    public ForumUserDao getForumUserDao() {
+	return forumUserDao;
+    }
 
-	public IRepositoryService getRepositoryService() {
-		return repositoryService;
-	}
+    public void setForumUserDao(ForumUserDao forumUserDao) {
+	this.forumUserDao = forumUserDao;
+    }
 
-	public void setRepositoryService(IRepositoryService repositoryService) {
-		this.repositoryService = repositoryService;
-	}
+    public IRepositoryService getRepositoryService() {
+	return repositoryService;
+    }
 
-	public ForumToolContentHandler getForumToolContentHandler() {
-		return forumToolContentHandler;
-	}
+    public void setRepositoryService(IRepositoryService repositoryService) {
+	this.repositoryService = repositoryService;
+    }
 
-	public void setForumToolContentHandler(ForumToolContentHandler toolContentHandler) {
-		forumToolContentHandler = toolContentHandler;
-	}
+    public ForumToolContentHandler getForumToolContentHandler() {
+	return forumToolContentHandler;
+    }
 
-	public ILearnerService getLearnerService() {
-		return learnerService;
-	}
+    public void setForumToolContentHandler(ForumToolContentHandler toolContentHandler) {
+	forumToolContentHandler = toolContentHandler;
+    }
 
-	public void setLearnerService(ILearnerService learnerService) {
-		this.learnerService = learnerService;
-	}
+    public ILearnerService getLearnerService() {
+	return learnerService;
+    }
 
-	public IExportToolContentService getExportContentService() {
-		return exportContentService;
-	}
+    public void setLearnerService(ILearnerService learnerService) {
+	this.learnerService = learnerService;
+    }
 
-	public void setExportContentService(IExportToolContentService exportContentService) {
-		this.exportContentService = exportContentService;
-	}
+    public IExportToolContentService getExportContentService() {
+	return exportContentService;
+    }
 
-	public IUserManagementService getUserManagementService() {
-		return userManagementService;
-	}
+    public void setExportContentService(IExportToolContentService exportContentService) {
+	this.exportContentService = exportContentService;
+    }
 
-	public void setUserManagementService(IUserManagementService userManagementService) {
-		this.userManagementService = userManagementService;
-	}
+    public IUserManagementService getUserManagementService() {
+	return userManagementService;
+    }
 
-	public ForumReportDAO getForumReportDAO() {
-		return forumReportDAO;
-	}
+    public void setUserManagementService(IUserManagementService userManagementService) {
+	this.userManagementService = userManagementService;
+    }
 
-	public void setForumReportDAO(ForumReportDAO forumReportDAO) {
-		this.forumReportDAO = forumReportDAO;
-	}
+    public ForumReportDAO getForumReportDAO() {
+	return forumReportDAO;
+    }
 
-	public ICoreNotebookService getCoreNotebookService() {
-		return coreNotebookService;
-	}
+    public void setForumReportDAO(ForumReportDAO forumReportDAO) {
+	this.forumReportDAO = forumReportDAO;
+    }
 
-	public void setCoreNotebookService(ICoreNotebookService coreNotebookService) {
-		this.coreNotebookService = coreNotebookService;
-	}
+    public ICoreNotebookService getCoreNotebookService() {
+	return coreNotebookService;
+    }
 
-	public IEventNotificationService getEventNotificationService() {
-		return eventNotificationService;
-	}
+    public void setCoreNotebookService(ICoreNotebookService coreNotebookService) {
+	this.coreNotebookService = coreNotebookService;
+    }
 
-	public void setEventNotificationService(IEventNotificationService eventNotificationService) {
-		this.eventNotificationService = eventNotificationService;
-	}
+    public IEventNotificationService getEventNotificationService() {
+	return eventNotificationService;
+    }
 
-	public String getLocalisedMessage(String key, Object[] args) {
-		return messageService.getMessage(key, args);
-	}
+    public void setEventNotificationService(IEventNotificationService eventNotificationService) {
+	this.eventNotificationService = eventNotificationService;
+    }
+
+    public String getLocalisedMessage(String key, Object[] args) {
+	return messageService.getMessage(key, args);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String createTextSearchConditionName(Collection<ForumCondition> existingConditions) {
+	String uniqueNumber = null;
+	do {
+	    uniqueNumber = String.valueOf(Math.abs(generator.nextInt()));
+	    for (ForumCondition condition : existingConditions) {
+		String[] splittedName = getForumOutputFactory().splitConditionName(condition.getName());
+		if (uniqueNumber.equals(splittedName[1])) {
+		    uniqueNumber = null;
+		}
+	    }
+	} while (uniqueNumber == null);
+	return getForumOutputFactory().buildTextSearchConditionName(uniqueNumber);
+    }
 }
\ No newline at end of file
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
===================================================================
diff -u -ra01292ae06e058ffcc16aaeec6d61959a7b69273 -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -24,6 +24,7 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.forum.service;
 
+import java.util.Collection;
 import java.util.List;
 
 import org.apache.struts.upload.FormFile;
@@ -32,6 +33,7 @@
 import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
 import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
 import org.lamsfoundation.lams.tool.forum.persistence.Forum;
+import org.lamsfoundation.lams.tool.forum.persistence.ForumCondition;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumReport;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumUser;
@@ -40,319 +42,356 @@
 import org.lamsfoundation.lams.util.audit.IAuditService;
 
 /**
- * User: conradb
- * Date: 8/06/2005
- * Time: 14:49:59
+ * User: conradb Date: 8/06/2005 Time: 14:49:59
  */
 public interface IForumService {
-	//************************************************************************************
-	// Forum Method
-	//************************************************************************************
-	/**
-	 * Create a Forum instance according to the default content. <BR> 
-	 * Note, this new insstance won't save into database until called persist method.
-	 * 
-	 * @param contentID
-	 * @return
-	 */
-	public Forum getDefaultContent(Long contentID);
+    // ************************************************************************************
+    // Forum Method
+    // ************************************************************************************
+    /**
+     * Create a Forum instance according to the default content. <BR>
+     * Note, this new insstance won't save into database until called persist method.
+     * 
+     * @param contentID
+     * @return
+     */
+    public Forum getDefaultContent(Long contentID);
 
-	/**
-	 * Update forum by given <code>Forum</code>. If forum does not exist, the create a new forum.
-	 * @param forum
-	 * @return
-	 * @throws PersistenceException
-	 */
-	public Forum updateForum(Forum forum) throws PersistenceException;
+    /**
+     * Update forum by given <code>Forum</code>. If forum does not exist, the create a new forum.
+     * 
+     * @param forum
+     * @return
+     * @throws PersistenceException
+     */
+    public Forum updateForum(Forum forum) throws PersistenceException;
 
-	/**
-	 * Upload instruction file
-	 * @param file
-	 * @param type
-	 * @return
-	 * @throws PersistenceException
-	 */
-	public Attachment uploadInstructionFile(FormFile file, String type) throws PersistenceException;
+    /**
+     * Upload instruction file
+     * 
+     * @param file
+     * @param type
+     * @return
+     * @throws PersistenceException
+     */
+    public Attachment uploadInstructionFile(FormFile file, String type) throws PersistenceException;
 
-	/**
-	 * Get forum by forum UID 
-	 * @param forumUid
-	 * @return
-	 * @throws PersistenceException
-	 */
-	public Forum getForum(Long forumUid) throws PersistenceException;
+    /**
+     * Get forum by forum UID
+     * 
+     * @param forumUid
+     * @return
+     * @throws PersistenceException
+     */
+    public Forum getForum(Long forumUid) throws PersistenceException;
 
-	/**
-	 * Get forum by forum ID(not record UID)
-	 * @param contentID
-	 * @return
-	 * @throws PersistenceException
-	 */
-	public Forum getForumByContentId(Long contentID) throws PersistenceException;
+    /**
+     * Get forum by forum ID(not record UID)
+     * 
+     * @param contentID
+     * @return
+     * @throws PersistenceException
+     */
+    public Forum getForumByContentId(Long contentID) throws PersistenceException;
 
-	/**
-	 * Delete authoring page instruction files.
-	 * @param attachmentId
-	 * @throws PersistenceException
-	 */
-	public void deleteForumAttachment(Long attachmentId) throws PersistenceException;
+    /**
+     * Delete authoring page instruction files.
+     * 
+     * @param attachmentId
+     * @throws PersistenceException
+     */
+    public void deleteForumAttachment(Long attachmentId) throws PersistenceException;
 
-	//************************************************************************************
-	//Topic Method
-	//************************************************************************************
-	/**
-	 * Create a root topic.
-	 * @param forumId
-	 * @param sessionId
-	 * @param message
-	 * @return
-	 * @throws PersistenceException
-	 */
-	public Message createRootTopic(Long forumId, Long sessionId, Message message) throws PersistenceException;
+    // ************************************************************************************
+    // Topic Method
+    // ************************************************************************************
+    /**
+     * Create a root topic.
+     * 
+     * @param forumId
+     * @param sessionId
+     * @param message
+     * @return
+     * @throws PersistenceException
+     */
+    public Message createRootTopic(Long forumId, Long sessionId, Message message) throws PersistenceException;
 
-	/**
-	 * Update a topic by give <code>Message</code> instance.
-	 * @param message
-	 * @return
-	 * @throws PersistenceException
-	 */
-	public Message updateTopic(Message message) throws PersistenceException;
+    /**
+     * Update a topic by give <code>Message</code> instance.
+     * 
+     * @param message
+     * @return
+     * @throws PersistenceException
+     */
+    public Message updateTopic(Message message) throws PersistenceException;
 
-	/**
-	 * Hide a message by given <code>Message</code> instance
-	 * @param message
-	 * @return
-	 * @throws PersistenceException
-	 */
-	public Message updateMessageHideFlag(Long messageId, boolean hideFlag) throws PersistenceException;
+    /**
+     * Hide a message by given <code>Message</code> instance
+     * 
+     * @param message
+     * @return
+     * @throws PersistenceException
+     */
+    public Message updateMessageHideFlag(Long messageId, boolean hideFlag) throws PersistenceException;
 
-	/**
-	 * Reply a topic.
-	 * @param parentId
-	 * @param sessionId ToolSessionID
-	 * @param message
-	 * @return
-	 * @throws PersistenceException
-	 */
-	public Message replyTopic(Long parentId, Long sessionId, Message message) throws PersistenceException;
+    /**
+     * Reply a topic.
+     * 
+     * @param parentId
+     * @param sessionId
+     *                ToolSessionID
+     * @param message
+     * @return
+     * @throws PersistenceException
+     */
+    public Message replyTopic(Long parentId, Long sessionId, Message message) throws PersistenceException;
 
-	/**
-	 * Delete the topic by given topic ID. The function will delete all children topics under this topic.
-	 * @param topicId
-	 * @throws PersistenceException
-	 */
-	public void deleteTopic(Long topicId) throws PersistenceException;
+    /**
+     * Delete the topic by given topic ID. The function will delete all children topics under this topic.
+     * 
+     * @param topicId
+     * @throws PersistenceException
+     */
+    public void deleteTopic(Long topicId) throws PersistenceException;
 
-	/**
-	 * Upload message attachment file into repository.
-	 * This method only upload the given file into system repository. It does not execute any database operation.
-	 * 
-	 * @param file
-	 * @return Attachment 
-	 * 		A new instance of attachment has uploaded file VersionID and UUID information.
-	 * @throws PersistenceException
-	 */
-	public Attachment uploadAttachment(FormFile file) throws PersistenceException;
+    /**
+     * Upload message attachment file into repository. This method only upload the given file into system repository. It
+     * does not execute any database operation.
+     * 
+     * @param file
+     * @return Attachment A new instance of attachment has uploaded file VersionID and UUID information.
+     * @throws PersistenceException
+     */
+    public Attachment uploadAttachment(FormFile file) throws PersistenceException;
 
-	/**
-	 * Delete  file from repository.
-	 * @param uuID
-	 * @param versionID
-	 * @throws PersistenceException
-	 */
-	public void deleteFromRepository(Long uuID, Long versionID) throws PersistenceException;
+    /**
+     * Delete file from repository.
+     * 
+     * @param uuID
+     * @param versionID
+     * @throws PersistenceException
+     */
+    public void deleteFromRepository(Long uuID, Long versionID) throws PersistenceException;
 
-	//************************************************************************************
-	//*********************Get topic methods **********************
-	//************************************************************************************
-	/** 
-	 * Get topic and its children list by given root topic ID.  
-	 * Note that the return type is DTO.
-	 * 
-	 * @param rootTopicId
-	 * @return
-	 * 		List of MessageDTO
-	 */
-	public List getTopicThread(Long rootTopicId);
+    // ************************************************************************************
+    // *********************Get topic methods **********************
+    // ************************************************************************************
+    /**
+     * Get topic and its children list by given root topic ID. Note that the return type is DTO.
+     * 
+     * @param rootTopicId
+     * @return List of MessageDTO
+     */
+    public List getTopicThread(Long rootTopicId);
 
-	/**
-	 * Get root topics by a given sessionID value. Simultanousely, it gets back topics, which author 
-	 * posted in authoring page for this forum, which is related with the given sessionID value.
-	 * 
-	 * This method will used by  user to display initial topic page for a forum. 
-	 * 
-	 * Note that the return type is DTO.
-	 * @param sessionId
-	 * @return
-	 * 		List of MessageDTO
-	 */
-	public List getRootTopics(Long sessionId);
+    /**
+     * Get root topics by a given sessionID value. Simultanousely, it gets back topics, which author posted in authoring
+     * page for this forum, which is related with the given sessionID value.
+     * 
+     * This method will used by user to display initial topic page for a forum.
+     * 
+     * Note that the return type is DTO.
+     * 
+     * @param sessionId
+     * @return List of MessageDTO
+     */
+    public List getRootTopics(Long sessionId);
 
-	/**
-	 * Get topics posted by author role. Note that the return type is DTO.
-	 * @return
-	 * 		List of MessageDTO
-	 */
-	public List getAuthoredTopics(Long forumId);
+    /**
+     * Get topics posted by author role. Note that the return type is DTO.
+     * 
+     * @return List of MessageDTO
+     */
+    public List getAuthoredTopics(Long forumId);
 
-	/**
-	 * This method will look up root topic ID by any level topicID.
-	 * @param topicId
-	 * @return
-	 */
-	public Long getRootTopicId(Long topicId);
+    /**
+     * This method will look up root topic ID by any level topicID.
+     * 
+     * @param topicId
+     * @return
+     */
+    public Long getRootTopicId(Long topicId);
 
-	/**
-	 * Get message by given message UID
-	 * @param messageUid
-	 * @return 
-	 * 		Message 
-	 * @throws PersistenceException
-	 */
-	public Message getMessage(Long messageUid) throws PersistenceException;
+    /**
+     * Get message by given message UID
+     * 
+     * @param messageUid
+     * @return Message
+     * @throws PersistenceException
+     */
+    public Message getMessage(Long messageUid) throws PersistenceException;
 
-	/**
-	 * Get message list posted by given user.
-	 * Note that the return type is DTO.
-	 * @param userId
-	 * @return
-	 */
-	public List getMessagesByUserUid(Long userId, Long sessionId);
+    /**
+     * Get message list posted by given user. Note that the return type is DTO.
+     * 
+     * @param userId
+     * @return
+     */
+    public List getMessagesByUserUid(Long userId, Long sessionId);
 
-	/**
-	 * Get how many post of this user post in a special session. DOES NOT include posts from author.
-	 * @param userID
-	 * @param sessionId
-	 * @return
-	 */
-	public int getTopicsNum(Long userID, Long sessionId);
+    /**
+     * Get how many post of this user post in a special session. DOES NOT include posts from author.
+     * 
+     * @param userID
+     * @param sessionId
+     * @return
+     */
+    public int getTopicsNum(Long userID, Long sessionId);
 
-	/**
-	 * Returns the number of posts this user has made in this topic.
-	 * @param userId
-	 * @param topicId
-	 * @return
-	 */
-	public int getNumOfPostsByTopic(Long userId, Long topicId);
+    /**
+     * Returns the number of posts this user has made in this topic.
+     * 
+     * @param userId
+     * @param topicId
+     * @return
+     */
+    public int getNumOfPostsByTopic(Long userId, Long topicId);
 
-	//************************************************************************************
-	// Session Method
-	//************************************************************************************
-	/**
-	 * Get Forum tool session by Session ID (not record UID).
-	 * @param sessionId
-	 * @return
-	 */
-	public ForumToolSession getSessionBySessionId(Long sessionId);
+    // ************************************************************************************
+    // Session Method
+    // ************************************************************************************
+    /**
+     * Get Forum tool session by Session ID (not record UID).
+     * 
+     * @param sessionId
+     * @return
+     */
+    public ForumToolSession getSessionBySessionId(Long sessionId);
 
-	/**
-	 * Get session list according to content ID. 
-	 * @param contentID
-	 * @return List
-	 */
-	public List getSessionsByContentId(Long contentID);
+    /**
+     * Get session list according to content ID.
+     * 
+     * @param contentID
+     * @return List
+     */
+    public List getSessionsByContentId(Long contentID);
 
-	/**
-	 * Get all message according to the given session ID.
-	 * @param sessionID
-	 * @return
-	 */
-	public List<MessageDTO> getAllTopicsFromSession(Long sessionID);
+    /**
+     * Get all message according to the given session ID.
+     * 
+     * @param sessionID
+     * @return
+     */
+    public List<MessageDTO> getAllTopicsFromSession(Long sessionID);
 
-	//************************************************************************************
-	// User  Method
-	//************************************************************************************
-	/**
-	 * Create a new user in database.
-	 * @param forumUser
-	 */
-	public void createUser(ForumUser forumUser);
+    // ************************************************************************************
+    // User Method
+    // ************************************************************************************
+    /**
+     * Create a new user in database.
+     * 
+     * @param forumUser
+     */
+    public void createUser(ForumUser forumUser);
 
-	/**
-	 * Get user by user ID (not record UID).
-	 * @param userId
-	 * @return
-	 */
-	public ForumUser getUserByUserAndSession(Long userId, Long sessionId);
+    /**
+     * Get user by user ID (not record UID).
+     * 
+     * @param userId
+     * @return
+     */
+    public ForumUser getUserByUserAndSession(Long userId, Long sessionId);
 
-	/**
-	 * Get user list by given session ID.
-	 * @param sessionID
-	 * @return
-	 */
-	public List getUsersBySessionId(Long sessionID);
+    /**
+     * Get user list by given session ID.
+     * 
+     * @param sessionID
+     * @return
+     */
+    public List getUsersBySessionId(Long sessionID);
 
-	/**
-	 * Get user by uid
-	 * @param userUid
-	 * @return
-	 */
-	public ForumUser getUser(Long userUid);
+    /**
+     * Get user by uid
+     * 
+     * @param userUid
+     * @return
+     */
+    public ForumUser getUser(Long userUid);
 
-	/**
-	 * Get user by user ID
-	 * @param userId
-	 * @return
-	 */
-	public ForumUser getUserByID(Long userId);
+    /**
+     * Get user by user ID
+     * 
+     * @param userId
+     * @return
+     */
+    public ForumUser getUserByID(Long userId);
 
-	/**
-	 * Update forum message report.
-	 * @param report
-	 */
-	public void updateReport(ForumReport report);
+    /**
+     * Update forum message report.
+     * 
+     * @param report
+     */
+    public void updateReport(ForumReport report);
 
-	//************************************************************************************
-	// Report  Method
-	//************************************************************************************
+    // ************************************************************************************
+    // Report Method
+    // ************************************************************************************
 
-	//************************************************************************************
-	// Miscellaneous Method
-	//************************************************************************************	
-	public void releaseMarksForSession(Long sessionID);
+    // ************************************************************************************
+    // Miscellaneous Method
+    // ************************************************************************************
+    public void releaseMarksForSession(Long sessionID);
 
-	/** The topic updates (for monitoring) are done in the web layer, so need the audit service to log the updates */
-	public IAuditService getAuditService();
+    /** The topic updates (for monitoring) are done in the web layer, so need the audit service to log the updates */
+    public IAuditService getAuditService();
 
-	/**
-	 * Mark user completing a session.  
-	 * @param currentUser
-	 */
-	public void finishUserSession(ForumUser currentUser);
+    /**
+     * Mark user completing a session.
+     * 
+     * @param currentUser
+     */
+    public void finishUserSession(ForumUser currentUser);
 
-	/**
-	 * Create refection entry into notebook tool.
-	 * @param sessionId
-	 * @param notebook_tool
-	 * @param tool_signature
-	 * @param userId
-	 * @param entryText
-	 */
-	public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId,
-			String entryText);
+    /**
+     * Create refection entry into notebook tool.
+     * 
+     * @param sessionId
+     * @param notebook_tool
+     * @param tool_signature
+     * @param userId
+     * @param entryText
+     */
+    public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId,
+	    String entryText);
 
-	/**
-	 * Get reflection entry from notebook tool.
-	 * @param sessionId
-	 * @param idType
-	 * @param signature
-	 * @param userID
-	 * @return
-	 */
-	public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID);
+    /**
+     * Get reflection entry from notebook tool.
+     * 
+     * @param sessionId
+     * @param idType
+     * @param signature
+     * @param userID
+     * @return
+     */
+    public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID);
 
-	/**
-	 * @param notebookEntry
-	 */
-	public void updateEntry(NotebookEntry notebookEntry);
+    /**
+     * @param notebookEntry
+     */
+    public void updateEntry(NotebookEntry notebookEntry);
 
-	public IEventNotificationService getEventNotificationService();
+    public IEventNotificationService getEventNotificationService();
 
-	/**
-	 * Gets a message from resource bundle. Same as <code><fmt:message></code> in JSP pages. 
-	 * @param key key of the message
-	 * @param args arguments for the message
-	 * @return message content
-	 */
-	String getLocalisedMessage(String key, Object[] args);
+    /**
+     * Gets a message from resource bundle. Same as <code><fmt:message></code> in JSP pages.
+     * 
+     * @param key
+     *                key of the message
+     * @param args
+     *                arguments for the message
+     * @return message content
+     */
+    String getLocalisedMessage(String key, Object[] args);
+
+    /**
+     * Creates an unique name for a ForumCondition. It consists of the tool output definition name and a unique positive
+     * integer number.
+     * 
+     * @param existingConditions
+     *                existing conditions; required to check if a condition with the same name does not exist.
+     * @return unique ForumCondition name
+     */
+    public String createTextSearchConditionName(Collection<ForumCondition> existingConditions);
+
+    public void deleteCondition(ForumCondition condition) throws PersistenceException;
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ConditionTopicComparator.java
===================================================================
diff -u
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ConditionTopicComparator.java	(revision 0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ConditionTopicComparator.java	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -0,0 +1,49 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $$Id$$ */
+
+package org.lamsfoundation.lams.tool.forum.util;
+
+import java.util.Comparator;
+
+import org.lamsfoundation.lams.tool.forum.persistence.Message;
+
+/**
+ * For finding topic order in Forum conditions.
+ * 
+ * @author Marcin Cieslak
+ * 
+ */
+public class ConditionTopicComparator implements Comparator<Message> {
+
+    public int compare(Message o1, Message o2) {
+	if (o1 != null && o2 != null) {
+	    return new DateComparator().compare(o1.getCreated(), o2.getCreated());
+	} else if (o1 != null) {
+	    return 1;
+	} else {
+	    return -1;
+	}
+    }
+}
\ No newline at end of file
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
diff -u -ra01292ae06e058ffcc16aaeec6d61959a7b69273 -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -25,136 +25,146 @@
 package org.lamsfoundation.lams.tool.forum.util;
 
 /**
- * User: conradb
- * Date: 14/06/2005
- * Time: 10:33:00
+ * User: conradb Date: 14/06/2005 Time: 10:33:00
  */
 public interface ForumConstants {
-	public static final String TOOL_SIGNATURE = "lafrum11";
+    public static final String TOOL_SIGNATURE = "lafrum11";
 
-	public static final String TOOL_CONTENT_HANDLER_NAME = "forumToolContentHandler";
+    public static final String TOOL_CONTENT_HANDLER_NAME = "forumToolContentHandler";
 
-	//See LDEV652 
-	// For old style (Fiona's description): The oldest topic is at the top, does not depends the reply date etc.
-	// For new style (Ernie's early desc): Most current popular forum used style: latest topics 
-	// should be at the top, reply date will descide the order etc.
-	public static final boolean OLD_FORUM_STYLE = true;
+    // See LDEV652
+    // For old style (Fiona's description): The oldest topic is at the top, does not depends the reply date etc.
+    // For new style (Ernie's early desc): Most current popular forum used style: latest topics
+    // should be at the top, reply date will descide the order etc.
+    public static final boolean OLD_FORUM_STYLE = true;
 
-	public static final int STATUS_CONTENT_COPYED = 1;
+    public static final int STATUS_CONTENT_COPYED = 1;
 
-	public static final int SESSION_STATUS_FINISHED = 1;
+    public static final int SESSION_STATUS_FINISHED = 1;
 
-	public final static int MAX_FILE_SIZE = 250 * 1000;
+    public final static int MAX_FILE_SIZE = 250 * 1000;
 
-	public final static String FORUM_SERVICE = "forumService";
+    public final static String FORUM_SERVICE = "forumService";
 
-	public final static String CONTENT_HANDLER = "toolContentHandler";
+    public final static String CONTENT_HANDLER = "toolContentHandler";
 
-	public static final String AUTHORING_DTO = "authoring";
+    public static final String AUTHORING_DTO = "authoring";
 
-	public static final String AUTHORING_TOPICS_LIST = "topicList";
+    public static final String AUTHORING_TOPICS_LIST = "topicList";
 
-	public static final String AUTHORING_TOPICS_INDEX = "topicIndex";
+    public static final String AUTHORING_TOPICS_INDEX = "topicIndex";
 
-	public static final String AUTHORING_TOPIC_THREAD = "topicThread";
+    public static final String AUTHORING_TOPIC_THREAD = "topicThread";
 
-	public static final String AUTHORING_TOPIC = "topic";
+    public static final String AUTHORING_TOPIC = "topic";
 
-	public static final String DEFAULT_TITLE = "Forum";
+    public static final String DEFAULT_TITLE = "Forum";
 
-	//TODO:hard code!!! need to read from config
-	public static final String TOOL_URL_BASE = "/lams/tool/lafrum11/";
+    // TODO:hard code!!! need to read from config
+    public static final String TOOL_URL_BASE = "/lams/tool/lafrum11/";
 
-	public static final String FORUM_ID = "forum_id";
+    public static final String FORUM_ID = "forum_id";
 
-	public static final String ATTR_ALLOW_EDIT = "allowEdit";
+    public static final String ATTR_ALLOW_EDIT = "allowEdit";
 
-	public static final String ATTR_ALLOW_UPLOAD = "allowUpload";
+    public static final String ATTR_ALLOW_UPLOAD = "allowUpload";
 
-	public static final String ATTR_ALLOW_NEW_TOPICS = "allowNewTopics";
+    public static final String ATTR_ALLOW_NEW_TOPICS = "allowNewTopics";
 
-	public static final String ATTR_ALLOW_RICH_EDITOR = "allowRichEditor";
+    public static final String ATTR_ALLOW_RICH_EDITOR = "allowRichEditor";
 
-	public static final String ATTR_LIMITED_CHARS = "limitedChars";
+    public static final String ATTR_LIMITED_CHARS = "limitedChars";
 
-	public static final String ATTR_LOCK_WHEN_FINISHED = "lockedWhenFinished";
+    public static final String ATTR_LOCK_WHEN_FINISHED = "lockedWhenFinished";
 
-	public static final String ONLINE_ATTACHMENT = "online_att";
+    public static final String ONLINE_ATTACHMENT = "online_att";
 
-	public static final String OFFLINE_ATTACHMENT = "offline_att";
+    public static final String OFFLINE_ATTACHMENT = "offline_att";
 
-	public static final String ATTACHMENT_LIST = "attachmentList";
+    public static final String ATTACHMENT_LIST = "attachmentList";
 
-	public static final String DELETED_ATTACHMENT_LIST = "deletedAttachmentList";
+    public static final String DELETED_ATTACHMENT_LIST = "deletedAttachmentList";
 
-	public static final String TOPIC_DELETED_ATTACHMENT_LIST = "topicDeletedAttachmentList";
+    public static final String TOPIC_DELETED_ATTACHMENT_LIST = "topicDeletedAttachmentList";
 
-	public static final String DELETED_AUTHORING_TOPICS_LIST = "deletedAuthoringTopicList";
+    public static final String DELETED_AUTHORING_TOPICS_LIST = "deletedAuthoringTopicList";
 
-	public static final String USER_UID = "userID";
+    public static final String USER_UID = "userID";
 
-	public static final String ATTR_FINISHED_LOCK = "finishedLock";
+    public static final String ATTR_FINISHED_LOCK = "finishedLock";
 
-	public static final String ATTR_USER_FINISHED = "userFinished";
+    public static final String ATTR_USER_FINISHED = "userFinished";
 
-	// used in monitoring 
-	public static final String TITLE = "title";
+    // used in monitoring
+    public static final String TITLE = "title";
 
-	public static final String INSTRUCTIONS = "instructions";
+    public static final String INSTRUCTIONS = "instructions";
 
-	public static final String PAGE_EDITABLE = "isPageEditable";
+    public static final String PAGE_EDITABLE = "isPageEditable";
 
-	public static final String ATTR_ROOT_TOPIC_UID = "rootUid";
+    public static final String ATTR_ROOT_TOPIC_UID = "rootUid";
 
-	public static final String ATTR_FORUM_TITLE = "title";
+    public static final String ATTR_FORUM_TITLE = "title";
 
-	public static final String ATTR_FORUM_INSTRCUTION = "instruction";
+    public static final String ATTR_FORUM_INSTRCUTION = "instruction";
 
-	public static final String ATTR_TOOL_CONTENT_TOPICS = "ToolContentTopicList";
+    public static final String ATTR_TOOL_CONTENT_TOPICS = "ToolContentTopicList";
 
-	public static final String ATTR_TOPIC = "topic";
+    public static final String ATTR_TOPIC = "topic";
 
-	public static final String ATTR_USER = "user";
+    public static final String ATTR_USER = "user";
 
-	public static final String ATTR_USER_UID = "userUid";
+    public static final String ATTR_USER_UID = "userUid";
 
-	public static final String ATTR_REPORT = "report";
+    public static final String ATTR_REPORT = "report";
 
-	public static final String ATTR_FILE_TYPE_FLAG = "fileTypeFlag";
+    public static final String ATTR_FILE_TYPE_FLAG = "fileTypeFlag";
 
-	public static final String PARAM_UPDATE_MODE = "updateMode";
+    public static final String PARAM_UPDATE_MODE = "updateMode";
 
-	public static final String ATTR_NO_MORE_POSTS = "noMorePosts";
+    public static final String ATTR_NO_MORE_POSTS = "noMorePosts";
 
-	public static final String ATTR_NUM_OF_POSTS = "numOfPosts";
+    public static final String ATTR_NUM_OF_POSTS = "numOfPosts";
 
-	public static final String ATTR_SESSION_MAP_ID = "sessionMapID";
+    public static final String ATTR_SESSION_MAP_ID = "sessionMapID";
 
-	public static final String ATTR_PARENT_TOPIC_ID = "parentID";
+    public static final String ATTR_PARENT_TOPIC_ID = "parentID";
 
-	// used when replying message LDEV-1305
-	public static final String ATTR_ORIGINAL_MESSAGE = "originalMessage";
+    // used when replying message LDEV-1305
+    public static final String ATTR_ORIGINAL_MESSAGE = "originalMessage";
 
-	public static final String ATTR_TOPIC_ID = "topicID";
+    public static final String ATTR_TOPIC_ID = "topicID";
 
-	public static final String ATTR_REFLECTION_ON = "reflectOn";
+    public static final String ATTR_REFLECTION_ON = "reflectOn";
 
-	public static final String ATTR_REFLECTION_INSTRUCTION = "reflectInstructions";
+    public static final String ATTR_REFLECTION_INSTRUCTION = "reflectInstructions";
 
-	public static final String ATTR_REFLECTION_ENTRY = "reflectEntry";
+    public static final String ATTR_REFLECTION_ENTRY = "reflectEntry";
 
-	public static final String ATTR_MINIMUM_REPLY = "minimumReply";
+    public static final String ATTR_MINIMUM_REPLY = "minimumReply";
 
-	public static final String ATTR_MAXIMUM_REPLY = "maximumReply";
+    public static final String ATTR_MAXIMUM_REPLY = "maximumReply";
 
-	public static final String MARK_UPDATE_FROM_SESSION = "listAllMarks";
+    public static final String MARK_UPDATE_FROM_SESSION = "listAllMarks";
 
-	public static final String MARK_UPDATE_FROM_USER = "listMarks";
+    public static final String MARK_UPDATE_FROM_USER = "listMarks";
 
-	public static final String MARK_UPDATE_FROM_FORUM = "viewForum";
+    public static final String MARK_UPDATE_FROM_FORUM = "viewForum";
 
-	public static final String ATTR_HIDE_REFLECTION = "hideReflection";
+    public static final String ATTR_HIDE_REFLECTION = "hideReflection";
 
-	public static final String EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE = "notify_learners_on_mark_release";
+    public static final String EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE = "notify_learners_on_mark_release";
 
+    // for condition management
+    public static final Object ATTR_CONDITION_SET = "conditionList";
+    public static final String PARAM_ORDER_ID = "orderId";
+    public static final String ATTR_DELETED_CONDITION_LIST = "deletedConditionList";
+
+    public static final String TEXT_SEARCH_DEFINITION_NAME = "text.search.output.definition.forum";
+    public final static String LEARNER_NUM_POSTS_DEFINITION_NAME = "learner.number.of.posts";
+
+    public static final String TEXT_SEARCH_DEFAULT_CONDITION_DISPLAY_NAME_KEY = "text.search.output.definition.forum.default.condition";
+    // a forward key
+    public static final String SUCCESS = "success";
+
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -r7dd15ff5149a5f87efd7cef5304819bf1bd0b78f -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 7dd15ff5149a5f87efd7cef5304819bf1bd0b78f)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -21,20 +21,20 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 
 package org.lamsfoundation.lams.tool.forum.web.actions;
 
-import static org.lamsfoundation.lams.tool.forum.util.ForumConstants.OLD_FORUM_STYLE;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+import java.util.SortedSet;
 import java.util.TreeMap;
+import java.util.TreeSet;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -54,10 +54,12 @@
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
+import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
 import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
 import org.lamsfoundation.lams.tool.forum.persistence.Forum;
+import org.lamsfoundation.lams.tool.forum.persistence.ForumCondition;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumUser;
 import org.lamsfoundation.lams.tool.forum.persistence.Message;
 import org.lamsfoundation.lams.tool.forum.persistence.PersistenceException;
@@ -81,558 +83,597 @@
  * @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();
-		//-----------------------Forum Author function ---------------------------
-	  	if (param.equals("initPage")) {
-	  		request.setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.AUTHOR);
-       		return initPage(mapping, form, request, response);
-        }
+    private static Logger log = Logger.getLogger(AuthoringAction.class);
+    private IForumService forumService;
 
-		// ***************** Monitoring define later screen ********************
-		if (param.equals("defineLater")){
-			//update define later flag to true
-			request.setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.TEACHER);
-			forumService = getForumManager();
-			Long contentId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
-			Forum forum = forumService.getForumByContentId(contentId);
-			
-			boolean isForumEditable = ForumWebUtils.isForumEditable(forum);
-			if(!isForumEditable){
-				request.setAttribute(ForumConstants.PAGE_EDITABLE, new Boolean(isForumEditable));
-				return mapping.findForward("forbidden");
+    @Override
+    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException, PersistenceException {
+
+	String param = mapping.getParameter();
+	// -----------------------Forum Author function ---------------------------
+	if (param.equals("initPage")) {
+	    request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.AUTHOR);
+	    return initPage(mapping, form, request, response);
+	}
+
+	// ***************** Monitoring define later screen ********************
+	if (param.equals("defineLater")) {
+	    // update define later flag to true
+	    request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER);
+	    forumService = getForumManager();
+	    Long contentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
+	    Forum forum = forumService.getForumByContentId(contentId);
+
+	    boolean isForumEditable = ForumWebUtils.isForumEditable(forum);
+	    if (!isForumEditable) {
+		request.setAttribute(ForumConstants.PAGE_EDITABLE, new Boolean(isForumEditable));
+		return mapping.findForward("forbidden");
+	    }
+
+	    if (!forum.isContentInUse()) {
+		forum.setDefineLater(true);
+		forumService.updateForum(forum);
+	    }
+
+	    return initPage(mapping, form, request, response);
+	}
+	if (param.equals("updateContent")) {
+	    return updateContent(mapping, form, request, response);
+	}
+	if (param.equals("uploadOnlineFile")) {
+	    return uploadOnline(mapping, form, request, response);
+	}
+	if (param.equals("uploadOfflineFile")) {
+	    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);
+	}
+	// -----------------------Topic function ---------------------------
+	if (param.equals("newTopic")) {
+	    return newTopic(mapping, form, request, response);
+	}
+	if (param.equals("createTopic")) {
+	    return createTopic(mapping, form, request, response);
+	}
+	if (param.equals("editTopic")) {
+	    return editTopic(mapping, form, request, response);
+	}
+	if (param.equals("updateTopic")) {
+	    return updateTopic(mapping, form, request, response);
+	}
+	if (param.equals("viewTopic")) {
+	    return viewTopic(mapping, form, request, response);
+	}
+	if (param.equals("deleteTopic")) {
+	    return deleteTopic(mapping, form, request, response);
+	}
+	if (param.equals("deleteAttachment")) {
+	    return deleteAttachment(mapping, form, request, response);
+	}
+	return mapping.findForward("error");
+    }
+
+    // ******************************************************************************************************************
+    // Forum Author functions
+    // ******************************************************************************************************************
+
+    /**
+     * 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) {
+	// initial Session Map
+	SessionMap sessionMap = new SessionMap();
+	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+
+	Long contentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	ForumForm forumForm = (ForumForm) form;
+	forumForm.setSessionMapID(sessionMap.getSessionID());
+	forumForm.setContentFolderID(contentFolderID);
+	sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
+
+	// get back the topic list and display them on page
+	forumService = getForumManager();
+
+	List<MessageDTO> topics = null;
+	Forum forum = null;
+	try {
+	    forum = forumService.getForumByContentId(contentId);
+	    // if forum does not exist, try to use default content instead.
+	    if (forum == null) {
+		forum = forumService.getDefaultContent(contentId);
+		if (forum.getMessages() != null) {
+		    TreeMap map = new TreeMap(new DateComparator());
+		    // sorted by create date
+		    Iterator iter = forum.getMessages().iterator();
+		    while (iter.hasNext()) {
+			Message topic = (Message) iter.next();
+			// contentFolderID != -1 means it is sysadmin: LDEV-906
+			if (topic.getCreatedBy() == null && !StringUtils.equals(contentFolderID, "-1")) {
+			    // get login user (author)
+			    HttpSession ss = SessionManager.getSession();
+			    // get back login user DTO
+			    UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+			    ForumUser fuser = new ForumUser(user, null);
+			    topic.setCreatedBy(fuser);
 			}
-			
-			if(!forum.isContentInUse()){
-				forum.setDefineLater(true);
-				forumService.updateForum(forum);
+			map.put(topic.getCreated(), topic);
+		    }
+		    topics = MessageDTO.getMessageDTO(new ArrayList(map.values()));
+		} else {
+		    topics = null;
+		}
+	    } else {
+		topics = forumService.getAuthoredTopics(forum.getUid());
+		// failure tolerance: if current contentID is defaultID, the createBy will be null.
+		// contentFolderID != -1 means it is sysadmin: LDEV-906
+		if (!StringUtils.equals(contentFolderID, "-1")) {
+		    for (MessageDTO messageDTO : topics) {
+			if (StringUtils.isBlank(messageDTO.getAuthor())) {
+			    // get login user (author)
+			    HttpSession ss = SessionManager.getSession();
+			    // get back login user DTO
+			    UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+			    ForumUser fuser = new ForumUser(user, null);
+			    messageDTO.setAuthor(fuser.getFirstName() + " " + fuser.getLastName());
 			}
-			
-       		return initPage(mapping, form, request, response);
+		    }
 		}
-        if (param.equals("updateContent")) {
-       		return updateContent(mapping, form, request, response);
-        }
-        if (param.equals("uploadOnlineFile")) {
-       		return uploadOnline(mapping, form, request, response);
-        }
-        if (param.equals("uploadOfflineFile")) {
-       		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);
-        }
-        //-----------------------Topic function ---------------------------
-	  	if (param.equals("newTopic")) {
-       		return newTopic(mapping, form, request, response);
-        }
-	  	if (param.equals("createTopic")) {
-       		return createTopic(mapping, form, request, response);
-        }
-	  	if (param.equals("editTopic")) {
-	  		return editTopic(mapping, form, request, response);
-	  	}
-	  	if (param.equals("updateTopic")) {
-	  		return updateTopic(mapping, form, request, response);
-	  	}
-        if (param.equals("viewTopic")) {
-       		return viewTopic(mapping, form, request, response);
-        }
-        if (param.equals("deleteTopic")) {
-        	return deleteTopic(mapping, form, request, response);
-        }
-        if (param.equals("deleteAttachment")) {
-        	return deleteAttachment(mapping, form, request, response);
-        }
-        return mapping.findForward("error");
+	    }
+	    // initialize attachmentList
+	    List attachmentList = getAttachmentList(sessionMap);
+	    attachmentList.addAll(forum.getAttachments());
+
+	    // tear down PO to normal object using clone() method
+	    forumForm.setForum((Forum) forum.clone());
+	} catch (Exception e) {
+	    AuthoringAction.log.error(e);
+	    return mapping.findForward("error");
 	}
-	//******************************************************************************************************************
-	//              Forum Author functions
-	//******************************************************************************************************************
 
-	/**
-	 * 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) {
-		//initial Session Map 
-		SessionMap sessionMap = new SessionMap();
-		request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
-		
-		Long contentId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
-		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		ForumForm forumForm = (ForumForm)form;
-		forumForm.setSessionMapID(sessionMap.getSessionID());
-		forumForm.setContentFolderID(contentFolderID);
-		sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
-		
-		//get back the topic list and display them on page
-		forumService = getForumManager();
+	// set back STRUTS component value
+	// init it to avoid null exception in following handling
+	if (topics == null) {
+	    topics = new ArrayList<MessageDTO>();
+	}
 
-		List<MessageDTO> topics = null;
-		Forum forum = null;
-		try {
-			forum = forumService.getForumByContentId(contentId);
-			//if forum does not exist, try to use default content instead.
-			if(forum == null){
-				forum = forumService.getDefaultContent(contentId);
-				if(forum.getMessages() != null){
-					TreeMap map = new TreeMap(new DateComparator());
-					//sorted by create date
-					Iterator iter = forum.getMessages().iterator();
-					while(iter.hasNext()){
-						Message topic = (Message) iter.next();
-						//contentFolderID != -1 means it is sysadmin: LDEV-906 
-						if(topic.getCreatedBy() == null && !StringUtils.equals(contentFolderID,"-1")){
-							//get login user (author)
-							HttpSession ss = SessionManager.getSession();
-							//get back login user DTO
-							UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-							ForumUser fuser = new ForumUser(user,null);
-							topic.setCreatedBy(fuser);
-						}
-						map.put(topic.getCreated(),topic);
-					}
-					topics = MessageDTO.getMessageDTO(new ArrayList(map.values()));
-				}else
-					topics = null;
-			}else{
-				topics = forumService.getAuthoredTopics(forum.getUid());
-				//failure tolerance: if current contentID is defaultID, the createBy will be null.
-				//contentFolderID != -1 means it is sysadmin: LDEV-906 
-				if(!StringUtils.equals(contentFolderID,"-1"))
-					for (MessageDTO messageDTO : topics) {
-						if(StringUtils.isBlank(messageDTO.getAuthor())){
-							//get login user (author)
-							HttpSession ss = SessionManager.getSession();
-							//get back login user DTO
-							UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-							ForumUser fuser = new ForumUser(user,null);
-							messageDTO.setAuthor(fuser.getFirstName()+" "+fuser.getLastName());
-						}
-					}
-			}
-			//initialize attachmentList
-			List attachmentList = getAttachmentList(sessionMap);
-			attachmentList.addAll(forum.getAttachments());
+	sessionMap.put(ForumConstants.AUTHORING_TOPICS_LIST, topics);
 
-			//tear down PO to normal object using clone() method
-			forumForm.setForum((Forum) forum.clone());
-		} catch (Exception e) {
-			log.error(e);
-			return mapping.findForward("error");
-		}
-		
-		//set back STRUTS component value
-		//init it to avoid null exception in following handling
-		if(topics == null)
-			topics = new ArrayList<MessageDTO>();
-		
-		sessionMap.put(ForumConstants.AUTHORING_TOPICS_LIST, topics);
-		return mapping.findForward("success");
+	// init condition set
+	SortedSet<ForumCondition> conditionSet = getForumConditionSet(sessionMap);
+	conditionSet.clear();
+	conditionSet.addAll(forum.getConditions());
+
+	return mapping.findForward("success");
+    }
+
+    /**
+     * Update all content for forum. These contents contain
+     * <ol>
+     * <li>Forum authoring infomation, e.g. online/offline instruction, title, advacnce options, etc.</li>
+     * <li>Uploaded offline/online instruction files</li>
+     * <li>Topics author created</li>
+     * <li>Topics' attachment file</li>
+     * <li>Author user information</li>
+     * </ol>
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    public ActionForward updateContent(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+
+	ToolAccessMode mode = getAccessMode(request);
+	ForumForm forumForm = (ForumForm) form;
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(forumForm.getSessionMapID());
+	// validation
+	ActionMessages errors = validate(forumForm, mapping, request);
+	if (!errors.isEmpty()) {
+	    saveErrors(request, errors);
+	    if (mode.isAuthor()) {
+		return mapping.findForward("author");
+	    } else {
+		return mapping.findForward("monitor");
+	    }
 	}
-	/**
-	 * Update all content for forum. These contents contain
-	 * <ol>
-	 * 	<li>Forum authoring infomation, e.g. online/offline instruction, title, advacnce options, etc.</li>
-	 *  <li>Uploaded offline/online instruction files</li>
-	 *  <li>Topics author created</li>
-	 *  <li>Topics' attachment file</li>
-	 *  <li>Author user information</li>
-	 * </ol>
-	 * 
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	public ActionForward updateContent(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
 
-		
-		ToolAccessMode mode = getAccessMode(request); 
-		ForumForm forumForm = (ForumForm)(form);
-		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(forumForm.getSessionMapID());
-		//validation
-		ActionMessages errors = validate(forumForm, mapping, request);
-		if(!errors.isEmpty()){
-			saveErrors(request, errors);
-			if(mode.isAuthor())
-	    		return mapping.findForward("author");
-	    	else
-	    		return mapping.findForward("monitor");			
+	Forum forum = forumForm.getForum();
+	// get back tool content ID
+	forum.setContentId(forumForm.getToolContentID());
+	try {
+	    forumService = getForumManager();
+
+	    // *******************************Handle user*******************
+	    String contentFolderID = (String) sessionMap.get(AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	    ForumUser forumUser = null;
+	    // check whether it is sysadmin:LDEV-906
+	    if (!StringUtils.equals(contentFolderID, "-1")) {
+		// try to get form system session
+		HttpSession ss = SessionManager.getSession();
+		// get back login user DTO
+		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+		forumUser = forumService.getUserByID(new Long(user.getUserID().intValue()));
+		if (forumUser == null) {
+		    forumUser = new ForumUser(user, null);
+		    forumService.createUser(forumUser);
 		}
-			
-		Forum forum = forumForm.getForum();
-		//get back tool content ID
-		forum.setContentId(forumForm.getToolContentID());
-		try {
-			forumService = getForumManager();
-			
-			//*******************************Handle user*******************
-			String contentFolderID = (String) sessionMap.get(AttributeNames.PARAM_CONTENT_FOLDER_ID);
-			ForumUser forumUser = null;
-			//check whether it is sysadmin:LDEV-906 
-			if(!StringUtils.equals(contentFolderID,"-1" )){
-				//try to get form system session
-				HttpSession ss = SessionManager.getSession();
-				//get back login user DTO
-				UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-				forumUser = forumService.getUserByID(new Long(user.getUserID().intValue()));
-				if(forumUser == null){
-					forumUser = new ForumUser(user,null);
-					forumService.createUser(forumUser);
-				}
-			}			
-			//**********************************Get Forum PO*********************
-			Forum forumPO = forumService.getForumByContentId(forumForm.getToolContentID());
-			if(forumPO == null){
-				//new Forum, create it.
-				forumPO = forum;
-				forumPO.setContentId(forumForm.getToolContentID());
-			}else{
-				if(mode.isAuthor()){
-					Long uid = forumPO.getUid();
-					PropertyUtils.copyProperties(forumPO,forum);
-					//get back UID
-					forumPO.setUid(uid);
-				}else{
-//					if it is Teacher, then just update basic tab content (definelater)
-					forumPO.setInstructions(forum.getInstructions());
-					forumPO.setTitle(forum.getTitle());
-//					change define later status
-					forumPO.setDefineLater(false);
-				}
+	    }
+	    // **********************************Get Forum PO*********************
+	    Forum forumPO = forumService.getForumByContentId(forumForm.getToolContentID());
+	    if (forumPO == null) {
+		// new Forum, create it.
+		forumPO = forum;
+		forumPO.setContentId(forumForm.getToolContentID());
+	    } else {
+		if (mode.isAuthor()) {
+		    Long uid = forumPO.getUid();
+		    PropertyUtils.copyProperties(forumPO, forum);
+		    // get back UID
+		    forumPO.setUid(uid);
+		} else {
+		    // if it is Teacher, then just update basic tab content (definelater)
+		    forumPO.setInstructions(forum.getInstructions());
+		    forumPO.setTitle(forum.getTitle());
+		    // change define later status
+		    forumPO.setDefineLater(false);
+		}
+	    }
+	    forumPO.setCreatedBy(forumUser);
+
+	    // **********************************Handle Attachement*********************
+	    // merge attachment info
+	    Set attPOSet = forumPO.getAttachments();
+	    if (attPOSet == null) {
+		attPOSet = new HashSet();
+	    }
+	    List attachmentList = getAttachmentList(sessionMap);
+	    List deleteAttachmentList = getDeletedAttachmentList(sessionMap);
+	    Iterator iter = attachmentList.iterator();
+	    while (iter.hasNext()) {
+		Attachment newAtt = (Attachment) iter.next();
+		attPOSet.add(newAtt);
+	    }
+	    attachmentList.clear();
+
+	    iter = deleteAttachmentList.iterator();
+	    while (iter.hasNext()) {
+		Attachment delAtt = (Attachment) iter.next();
+		iter.remove();
+		// it is an existed att, then delete it from current attachmentPO
+		if (delAtt.getUid() != null) {
+		    Iterator attIter = attPOSet.iterator();
+		    while (attIter.hasNext()) {
+			Attachment att = (Attachment) attIter.next();
+			if (delAtt.getUid().equals(att.getUid())) {
+			    attIter.remove();
+			    break;
 			}
-			forumPO.setCreatedBy(forumUser);
-			
-			//**********************************Handle Attachement*********************
-	    	//merge attachment info
-			Set attPOSet = forumPO.getAttachments();
-			if(attPOSet == null)
-				attPOSet = new HashSet();
-			List attachmentList = getAttachmentList(sessionMap);
-			List deleteAttachmentList = getDeletedAttachmentList(sessionMap);
-			Iterator iter = attachmentList.iterator();
-			while(iter.hasNext()){
-				Attachment newAtt = (Attachment) iter.next();
-				attPOSet.add(newAtt);
-			}
-			attachmentList.clear();
-			
-			iter = deleteAttachmentList.iterator();
-			while(iter.hasNext()){
-				Attachment delAtt = (Attachment) iter.next();
-				iter.remove();
-				//it is an existed att, then delete it from current attachmentPO
-				if(delAtt.getUid() != null){
-					Iterator attIter = attPOSet.iterator();
-					while(attIter.hasNext()){
-						Attachment att = (Attachment) attIter.next();
-						if(delAtt.getUid().equals(att.getUid())){
-							attIter.remove();
-							break;
-						}
-					}
-					forumService.deleteForumAttachment(delAtt.getUid());
-				}//end remove from persist value
-			}
-			
-			//copy back
-			forumPO.setAttachments(attPOSet);
-			forum = forumService.updateForum(forumPO);
-			
-			//********************************Handle topic*******************
-			//delete message attachment
-			List topicDeleteAttachmentList = getTopicDeletedAttachmentList(sessionMap);
-			iter = topicDeleteAttachmentList.iterator();
-			while(iter.hasNext()){
-				Attachment delAtt = (Attachment) iter.next();
-				iter.remove();
-			}
-			
-			//Handle message
-			List topics = getTopicList(sessionMap);
-	    	iter = topics.iterator();
-	    	while(iter.hasNext()){
-	    		MessageDTO dto = (MessageDTO) iter.next();
-	    		if(dto.getMessage() != null){
-    				//This flushs user UID info to message if this user is a new user. 
-    				dto.getMessage().setCreatedBy(forumUser);
-    				dto.getMessage().setModifiedBy(forumUser);
-	    			forumService.createRootTopic(forum.getUid(),null,dto.getMessage());
-	    		}
-	    	}
-	    	//delete them from database.
-	    	List delTopics = getDeletedTopicList(sessionMap);
-	    	iter = delTopics.iterator();
-	    	while(iter.hasNext()){
-	    		MessageDTO dto = (MessageDTO) iter.next();
-	    		iter.remove();
-	    		if(dto.getMessage() != null && dto.getMessage().getUid() != null)
-	    			forumService.deleteTopic(dto.getMessage().getUid());
-	    	}
+		    }
+		    forumService.deleteForumAttachment(delAtt.getUid());
+		}// end remove from persist value
+	    }
 
-			//initialize attachmentList again
-			attachmentList = getAttachmentList(sessionMap);
-			attachmentList.addAll(forum.getAttachments());
-		} catch (Exception e) {
-			log.error(e);
+	    // copy back
+	    forumPO.setAttachments(attPOSet);
+	    forum = forumService.updateForum(forumPO);
+
+	    // ********************************Handle topic*******************
+	    // delete message attachment
+	    List topicDeleteAttachmentList = getTopicDeletedAttachmentList(sessionMap);
+	    iter = topicDeleteAttachmentList.iterator();
+	    while (iter.hasNext()) {
+		Attachment delAtt = (Attachment) iter.next();
+		iter.remove();
+	    }
+
+	    // Handle message
+	    List topics = getTopicList(sessionMap);
+	    iter = topics.iterator();
+	    while (iter.hasNext()) {
+		MessageDTO dto = (MessageDTO) iter.next();
+		if (dto.getMessage() != null) {
+		    // This flushs user UID info to message if this user is a new user.
+		    dto.getMessage().setCreatedBy(forumUser);
+		    dto.getMessage().setModifiedBy(forumUser);
+		    forumService.createRootTopic(forum.getUid(), null, dto.getMessage());
 		}
-		
-		
-    	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG,Boolean.TRUE);
-    	if(mode.isAuthor())
-    		return mapping.findForward("author");
-    	else
-    		return mapping.findForward("monitor");
+	    }
+	    // delete them from database.
+	    List delTopics = getDeletedTopicList(sessionMap);
+	    iter = delTopics.iterator();
+	    while (iter.hasNext()) {
+		MessageDTO dto = (MessageDTO) iter.next();
+		iter.remove();
+		if (dto.getMessage() != null && dto.getMessage().getUid() != null) {
+		    forumService.deleteTopic(dto.getMessage().getUid());
+		}
+	    }
+
+	    Set<ForumCondition> conditionSet = new TreeSet<ForumCondition>(new TextSearchConditionComparator());
+	    Set<ForumCondition> existingConditionSet = getForumConditionSet(sessionMap);
+	    conditionSet.addAll(existingConditionSet);
+	    forum.setConditions(conditionSet);
+
+	    forum = forumService.updateForum(forum);
+
+	    List delConditions = getDeletedForumConditionList(sessionMap);
+	    iter = delConditions.iterator();
+	    while (iter.hasNext()) {
+		ForumCondition condition = (ForumCondition) iter.next();
+		iter.remove();
+		forumService.deleteCondition(condition);
+	    }
+
+	    // initialize attachmentList again
+	    attachmentList = getAttachmentList(sessionMap);
+	    attachmentList.addAll(forum.getAttachments());
+	} catch (Exception e) {
+	    AuthoringAction.log.error(e);
 	}
 
-	/**
-	 * Handle upload online instruction files request. 
-	 * @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);
+	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	if (mode.isAuthor()) {
+	    return mapping.findForward("author");
+	} else {
+	    return mapping.findForward("monitor");
 	}
-	/**
-	 * Handle upload offline instruction files request.
-	 * @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);
+    }
+
+    /**
+     * Handle upload online instruction files request.
+     * 
+     * @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.
+     * 
+     * @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;
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(forumForm.getSessionMapID());
+
+	FormFile file;
+	if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
+	    file = forumForm.getOfflineFile();
+	} else {
+	    file = forumForm.getOnlineFile();
 	}
-	/**
-	 * 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;
-		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(forumForm.getSessionMapID());
-		
-		FormFile file;
-		if(StringUtils.equals(IToolContentHandler.TYPE_OFFLINE,type))
-			file = (FormFile) forumForm.getOfflineFile();
-		else
-			file = (FormFile) forumForm.getOnlineFile();
-		
-		if(file == null || StringUtils.isBlank(file.getFileName()))
-			return mapping.findForward("success");
-		
-		ActionMessages errors = new ActionMessages();
-		FileValidatorUtil.validateFileSize(file, true, errors );
-		if(!errors.isEmpty()){
-			this.saveErrors(request, errors);
-			return mapping.findForward("success");
-		}
-		
-		forumService = getForumManager();
-		//upload to repository
-		Attachment att = forumService.uploadInstructionFile(file, type);
-		
-		//handle session value
-		List attachmentList = getAttachmentList(sessionMap);
-		List deleteAttachmentList = getDeletedAttachmentList(sessionMap);
-		//first check exist attachment and delete old one (if exist) to deletedAttachmentList
-		Iterator iter = attachmentList.iterator();
-		Attachment existAtt;
-		while(iter.hasNext()){
-			existAtt = (Attachment) iter.next();
-			if (StringUtils.equals(existAtt.getFileName(), att.getFileName())
-					&& StringUtils.equals(existAtt.getFileType(), att.getFileType())) {
-				//if there is same name attachment, delete old one
-				deleteAttachmentList.add(existAtt);
-				iter.remove();
-				break;
-			}
-		}
-		//add to attachmentList
-		attachmentList.add(att);
-		
-		return mapping.findForward("success");
+	if (file == null || StringUtils.isBlank(file.getFileName())) {
+	    return mapping.findForward("success");
+	}
 
+	ActionMessages errors = new ActionMessages();
+	FileValidatorUtil.validateFileSize(file, true, errors);
+	if (!errors.isEmpty()) {
+	    this.saveErrors(request, errors);
+	    return mapping.findForward("success");
 	}
 
+	forumService = getForumManager();
+	// upload to repository
+	Attachment att = forumService.uploadInstructionFile(file, type);
 
-	/**
-	 * Delete offline instruction file from current Forum authoring page.
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	public ActionForward deleteOfflineFile(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
-		return deleteFile(mapping, form,request, response, IToolContentHandler.TYPE_OFFLINE);
+	// handle session value
+	List attachmentList = getAttachmentList(sessionMap);
+	List deleteAttachmentList = getDeletedAttachmentList(sessionMap);
+	// first check exist attachment and delete old one (if exist) to deletedAttachmentList
+	Iterator iter = attachmentList.iterator();
+	Attachment existAtt;
+	while (iter.hasNext()) {
+	    existAtt = (Attachment) iter.next();
+	    if (StringUtils.equals(existAtt.getFileName(), att.getFileName())
+		    && StringUtils.equals(existAtt.getFileType(), att.getFileType())) {
+		// if there is same name attachment, delete old one
+		deleteAttachmentList.add(existAtt);
+		iter.remove();
+		break;
+	    }
 	}
-	/**
-	 * Delete online instruction file from current Forum authoring page.
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	public ActionForward deleteOnlineFile(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
-		return deleteFile(mapping, form,request, response, IToolContentHandler.TYPE_ONLINE);
+	// add to attachmentList
+	attachmentList.add(att);
+
+	return mapping.findForward("success");
+
+    }
+
+    /**
+     * Delete offline instruction file from current Forum authoring page.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    public ActionForward deleteOfflineFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	return deleteFile(mapping, form, request, response, IToolContentHandler.TYPE_OFFLINE);
+    }
+
+    /**
+     * Delete online instruction file from current Forum authoring page.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    public ActionForward deleteOnlineFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	return deleteFile(mapping, form, request, response, IToolContentHandler.TYPE_ONLINE);
+    }
+
+    /**
+     * @param request
+     * @param response
+     * @param form
+     * @param type
+     * @return
+     */
+    private ActionForward deleteFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response, String type) {
+	Long versionID = new Long(WebUtil.readLongParam(request, "versionID"));
+	Long uuID = new Long(WebUtil.readLongParam(request, "uuID"));
+	// get sessionMAP
+	String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+
+	// handle session value
+	List attachmentList = getAttachmentList(sessionMap);
+	List deleteAttachmentList = getDeletedAttachmentList(sessionMap);
+	// first check exist attachment and delete old one (if exist) to deletedAttachmentList
+	Iterator iter = attachmentList.iterator();
+	Attachment existAtt;
+	while (iter.hasNext()) {
+	    existAtt = (Attachment) iter.next();
+	    if (existAtt.getFileUuid().equals(uuID) && existAtt.getFileVersionId().equals(versionID)) {
+		// if there is same name attachment, delete old one
+		deleteAttachmentList.add(existAtt);
+		iter.remove();
+	    }
+
 	}
 
-	/**
-	 * @param request
-	 * @param response
-	 * @param form 
-	 * @param type 
-	 * @return
-	 */
-	private ActionForward deleteFile(ActionMapping mapping,ActionForm form,HttpServletRequest request, HttpServletResponse response, String type){
-		Long versionID = new Long(WebUtil.readLongParam(request,"versionID"));
-		Long uuID = new Long(WebUtil.readLongParam(request,"uuID"));
-		//get sessionMAP
-		String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID);
-		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-		
-		//handle session value
-		List attachmentList = getAttachmentList(sessionMap);
-		List deleteAttachmentList = getDeletedAttachmentList(sessionMap);
-		//first check exist attachment and delete old one (if exist) to deletedAttachmentList
-		Iterator iter = attachmentList.iterator();
-		Attachment existAtt;
-		while(iter.hasNext()){
-			existAtt = (Attachment) iter.next();
-			if(existAtt.getFileUuid().equals(uuID) && existAtt.getFileVersionId().equals(versionID)){
-				//if there is same name attachment, delete old one
-				deleteAttachmentList.add(existAtt);
-				iter.remove();
-			}
-				
-		}
-		
-		request.setAttribute(ForumConstants.ATTR_FILE_TYPE_FLAG, type);
-		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-		return mapping.findForward("success");
+	request.setAttribute(ForumConstants.ATTR_FILE_TYPE_FLAG, type);
+	request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	return mapping.findForward("success");
+    }
+
+    // ******************************************************************************************************************
+    // Topic functions
+    // ******************************************************************************************************************
+    /**
+     * Display emtpy topic page for user input topic information. This page will contain all topics list which this
+     * author posted before.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward newTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID);
+	((MessageForm) form).setSessionMapID(sessionMapID);
+
+	return mapping.findForward("success");
+    }
+
+    /**
+     * Create a topic in memory. This topic will be saved when user save entire authoring page.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws IOException
+     * @throws ServletException
+     * @throws PersistenceException
+     */
+    public ActionForward createTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException, PersistenceException {
+	MessageForm messageForm = (MessageForm) form;
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(messageForm.getSessionMapID());
+	request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, messageForm.getSessionMapID());
+
+	List topics = getTopicList(sessionMap);
+	// get login user (author)
+	HttpSession ss = SessionManager.getSession();
+	// get back login user DTO
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+
+	// get message info from web page
+	Message message = messageForm.getMessage();
+	// init some basic variables for first time create
+	message.setIsAuthored(true);
+	message.setCreated(new Date());
+	message.setUpdated(new Date());
+	message.setLastReplyDate(new Date());
+
+	// check whether this user exist or not
+	ForumUser forumUser = forumService.getUserByID(new Long(user.getUserID().intValue()));
+	String contentFolderID = (String) sessionMap.get(AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	// check whether it is sysadmin:LDEV-906
+	if (forumUser == null && !StringUtils.equals(contentFolderID, "-1")) {
+	    // if user not exist, create new one in database
+	    forumUser = new ForumUser(user, null);
 	}
-	
-	//******************************************************************************************************************
-	//              Topic functions
-	//******************************************************************************************************************
-	/**
-	 * Display emtpy topic page for user input topic information. This page will contain all topics list which 
-	 * this author posted before.
-	 *  
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	private ActionForward newTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) {
-		String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID );
-		((MessageForm)form).setSessionMapID(sessionMapID);
-		
-		return mapping.findForward("success");
+	message.setCreatedBy(forumUser);
+	// same person with create at first time
+	message.setModifiedBy(forumUser);
+
+	// set attachment of this topic
+	Set attSet = null;
+	if (messageForm.getAttachmentFile() != null
+		&& !StringUtils.isEmpty(messageForm.getAttachmentFile().getFileName())) {
+	    forumService = getForumManager();
+	    Attachment att = forumService.uploadAttachment(messageForm.getAttachmentFile());
+	    // only allow one attachment, so replace whatever
+	    attSet = new HashSet();
+	    attSet.add(att);
 	}
-	/**
-	 * Create a topic in memory. This topic will be saved when user save entire authoring page.
-	 * 
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 * @throws IOException
-	 * @throws ServletException
-	 * @throws PersistenceException
-	 */
-	public ActionForward createTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) throws IOException, ServletException, PersistenceException {
-		MessageForm messageForm = (MessageForm) form;
-		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(messageForm.getSessionMapID());
-		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, messageForm.getSessionMapID());
-		
-		List topics = getTopicList(sessionMap);
-		//get login user (author)
-		HttpSession ss = SessionManager.getSession();
-		//get back login user DTO
-		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-		
-		//get message info from web page
-		Message message = messageForm.getMessage();
-		//init some basic variables for first time create
-		message.setIsAuthored(true);
-		message.setCreated(new Date());
-		message.setUpdated(new Date());
-		message.setLastReplyDate(new Date());
-		
-		//check whether this user exist or not
-		ForumUser forumUser = forumService.getUserByID(new Long(user.getUserID().intValue()));
-		String contentFolderID = (String) sessionMap.get(AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		//check whether it is sysadmin:LDEV-906 
-		if(forumUser == null && !StringUtils.equals(contentFolderID,"-1" )){
-			//if user not exist, create new one in database
-			forumUser = new ForumUser(user,null);
-		}
-		message.setCreatedBy(forumUser);
-		//same person with create at first time
-		message.setModifiedBy(forumUser);
-		
-		//set attachment of this topic
-		Set attSet = null;
-		if(messageForm.getAttachmentFile() != null 
-			&&  !StringUtils.isEmpty(messageForm.getAttachmentFile().getFileName())){
-			forumService = getForumManager();
-			Attachment att = forumService.uploadAttachment(messageForm.getAttachmentFile());
-			//only allow one attachment, so replace whatever
-			attSet = new HashSet();
-			attSet.add(att);
-		}
-		message.setAttachments(attSet);
-		
-		//save the new message into HttpSession
-		if(OLD_FORUM_STYLE)
-			topics.add(MessageDTO.getMessageDTO(message));
-		else
-			topics.add(0,MessageDTO.getMessageDTO(message));
-		
-		
-		return mapping.findForward("success");
+	message.setAttachments(attSet);
+
+	// save the new message into HttpSession
+	if (ForumConstants.OLD_FORUM_STYLE) {
+	    topics.add(MessageDTO.getMessageDTO(message));
+	} else {
+	    topics.add(0, MessageDTO.getMessageDTO(message));
 	}
+
+	return mapping.findForward("success");
+    }
+
     /**
-     * Diplay a special topic information. Only display author created root message content,  even this topic already
-     * has some reply messages from learner in some cases. 
+     * Diplay a special topic information. Only display author created root message content, even this topic already has
+     * some reply messages from learner in some cases.
      * 
      * @param mapping
      * @param form
@@ -642,65 +683,83 @@
      * @throws PersistenceException
      */
     public ActionForward viewTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) throws PersistenceException {
-    	
-    	//get SessionMAP
-		String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID );
-		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-		
-    	List topics = getTopicList(sessionMap);
-    	String topicIndex = (String) request.getParameter(ForumConstants.AUTHORING_TOPICS_INDEX);
-		int topicIdx = NumberUtils.stringToInt(topicIndex,-1);
-		
-		//if topicIndex is empty, try to get it from Request Attribute again.
-		//This may be caused by reresh this page, back from edit page etc.
-		if(topicIdx == -1){
-			topicIndex = (String) request.getAttribute(ForumConstants.AUTHORING_TOPICS_INDEX);
-			topicIdx = NumberUtils.stringToInt(topicIndex,-1);
-		}
-		
-		if(topicIdx != -1){
-			MessageDTO topic = (MessageDTO) topics.get(topicIdx);
-			request.setAttribute(ForumConstants.AUTHORING_TOPICS_INDEX,topicIndex);
-			request.setAttribute(ForumConstants.AUTHORING_TOPIC,topic);
-    	}
-		
-    	return mapping.findForward("success");
-    	
+	    HttpServletResponse response) throws PersistenceException {
+
+	// get SessionMAP
+	String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+
+	List topics = getTopicList(sessionMap);
+	String topicIndex = request.getParameter(ForumConstants.AUTHORING_TOPICS_INDEX);
+	int topicIdx = NumberUtils.stringToInt(topicIndex, -1);
+
+	// if topicIndex is empty, try to get it from Request Attribute again.
+	// This may be caused by reresh this page, back from edit page etc.
+	if (topicIdx == -1) {
+	    topicIndex = (String) request.getAttribute(ForumConstants.AUTHORING_TOPICS_INDEX);
+	    topicIdx = NumberUtils.stringToInt(topicIndex, -1);
+	}
+
+	if (topicIdx != -1) {
+	    MessageDTO topic = (MessageDTO) topics.get(topicIdx);
+	    request.setAttribute(ForumConstants.AUTHORING_TOPICS_INDEX, topicIndex);
+	    request.setAttribute(ForumConstants.AUTHORING_TOPIC, topic);
+	}
+
+	return mapping.findForward("success");
+
     }
-	/**
-	 * Delete a topic form current topic list. But database record will be deleted only when user save whole authoring 
-	 * page. 
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 * @throws PersistenceException
-	 */
+
+    /**
+     * Delete a topic form current topic list. But database record will be deleted only when user save whole authoring
+     * page.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws PersistenceException
+     */
     public ActionForward deleteTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) throws PersistenceException {
-		//get SessionMAP
-		String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID );
-		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID,sessionMapID);
-    	List topics = getTopicList(sessionMap);
-		String topicIndex = (String) request.getParameter(ForumConstants.AUTHORING_TOPICS_INDEX);
-		int topicIdx = NumberUtils.stringToInt(topicIndex,-1);
+	    HttpServletResponse response) throws PersistenceException {
+	// get SessionMAP
+	String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	List topics = getTopicList(sessionMap);
+	String topicIndex = request.getParameter(ForumConstants.AUTHORING_TOPICS_INDEX);
+	int topicIdx = NumberUtils.stringToInt(topicIndex, -1);
 
-		if(topicIdx != -1){
-			Object obj = topics.remove(topicIdx);
-			List delList = getDeletedTopicList(sessionMap);
-			delList.add(obj);
-    	}
-		
-		return mapping.findForward("success");
+	if (topicIdx != -1) {
+	    Object obj = topics.remove(topicIdx);
+	    List delList = getDeletedTopicList(sessionMap);
+	    delList.add(obj);
+
+	    SortedSet<ForumCondition> list = getForumConditionSet(sessionMap);
+	    Iterator<ForumCondition> conditionIter = list.iterator();
+
+	    while (conditionIter.hasNext()) {
+		ForumCondition condition = conditionIter.next();
+		Iterator<Message> topicIter = condition.getTopics().iterator();
+		while (topicIter.hasNext()) {
+		    if (topicIter.next() == obj) {
+			topicIter.remove();
+		    }
+		}
+		if (condition.getTopics().isEmpty()) {
+		    conditionIter.remove();
+		}
+	    }
 	}
 
+	return mapping.findForward("success");
+    }
+
     /**
-     * Display a HTML FORM which contains subject, body and attachment information from a special topic. This page
-     * is ready for user update this topic.
+     * Display a HTML FORM which contains subject, body and attachment information from a special topic. This page is
+     * ready for user update this topic.
      * 
      * @param mapping
      * @param form
@@ -710,45 +769,46 @@
      * @throws PersistenceException
      */
     public ActionForward editTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) throws PersistenceException {
-    	
-//    	get SessionMAP
-		String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID );
-		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-		
-		MessageForm msgForm = (MessageForm)form;
-		msgForm.setSessionMapID(sessionMapID);
-		
-    	List topics = getTopicList(sessionMap);
-    	String topicIndex = (String) request.getParameter(ForumConstants.AUTHORING_TOPICS_INDEX);
-		int topicIdx = NumberUtils.stringToInt(topicIndex,-1);
-		if(topicIdx != -1){
-			MessageDTO topic = (MessageDTO) topics.get(topicIdx);
-			if (topic != null) {
-				//check whehter the edit topic and the current user are same person, if not, forbidden to edit topic
-				if(topic.getMessage() != null && topic.getMessage().getCreatedBy() != null){
-					//get login user (author)
-					HttpSession ss = SessionManager.getSession();
-					//get back login user DTO
-					UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-					Long topicAuthorId = topic.getMessage().getCreatedBy().getUserId();
-					if(!(new Long(user.getUserID().intValue()).equals(topicAuthorId)))
-						return mapping.findForward("forbiden");
-				}
-				//update message to HTML Form to echo back to web page: for subject, body display
-				msgForm.setMessage(topic.getMessage());
-			}
-			//echo back to web page: for attachment display
-			request.setAttribute(ForumConstants.AUTHORING_TOPIC,topic);
-    	}
-		
-		request.setAttribute(ForumConstants.AUTHORING_TOPICS_INDEX,topicIndex);
-    	return mapping.findForward("success");
+	    HttpServletResponse response) throws PersistenceException {
+
+	// get SessionMAP
+	String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+
+	MessageForm msgForm = (MessageForm) form;
+	msgForm.setSessionMapID(sessionMapID);
+
+	List topics = getTopicList(sessionMap);
+	String topicIndex = request.getParameter(ForumConstants.AUTHORING_TOPICS_INDEX);
+	int topicIdx = NumberUtils.stringToInt(topicIndex, -1);
+	if (topicIdx != -1) {
+	    MessageDTO topic = (MessageDTO) topics.get(topicIdx);
+	    if (topic != null) {
+		// check whehter the edit topic and the current user are same person, if not, forbidden to edit topic
+		if (topic.getMessage() != null && topic.getMessage().getCreatedBy() != null) {
+		    // get login user (author)
+		    HttpSession ss = SessionManager.getSession();
+		    // get back login user DTO
+		    UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+		    Long topicAuthorId = topic.getMessage().getCreatedBy().getUserId();
+		    if (!new Long(user.getUserID().intValue()).equals(topicAuthorId)) {
+			return mapping.findForward("forbiden");
+		    }
+		}
+		// update message to HTML Form to echo back to web page: for subject, body display
+		msgForm.setMessage(topic.getMessage());
+	    }
+	    // echo back to web page: for attachment display
+	    request.setAttribute(ForumConstants.AUTHORING_TOPIC, topic);
+	}
+
+	request.setAttribute(ForumConstants.AUTHORING_TOPICS_INDEX, topicIndex);
+	return mapping.findForward("success");
     }
-    
+
     /**
-     * Submit user updated inforamion in a topic to memory. This update will be submit to database only when user
-     * save whole authoring page.
+     * Submit user updated inforamion in a topic to memory. This update will be submit to database only when user save
+     * whole authoring page.
      * 
      * @param mapping
      * @param form
@@ -758,203 +818,239 @@
      * @throws PersistenceException
      */
     public ActionForward updateTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) throws PersistenceException {
-    	MessageForm messageForm = (MessageForm) form;
-    	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(messageForm.getSessionMapID());
-    	request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, messageForm.getSessionMapID());
-    	
-    	//get value from HttpSession
-    	List topics = getTopicList(sessionMap);
-		//get param from HttpServletRequest
-		String topicIndex = (String) request.getParameter(ForumConstants.AUTHORING_TOPICS_INDEX);
-		int topicIdx = NumberUtils.stringToInt(topicIndex,-1);
-		
-		if(topicIdx != -1){
-			Message message = messageForm.getMessage();
-			
-			MessageDTO newMsg = (MessageDTO) topics.get(topicIdx);
-			if(newMsg.getMessage()== null)
-				newMsg.setMessage(new Message());
-			
-			newMsg.getMessage().setSubject(message.getSubject());
-			newMsg.getMessage().setBody(message.getBody());
-			newMsg.getMessage().setUpdated(new Date());
-			//update attachment
-			if(messageForm.getAttachmentFile() != null 
-					&&  !StringUtils.isEmpty(messageForm.getAttachmentFile().getFileName())){
-				forumService = getForumManager();
-				Attachment att = forumService.uploadAttachment(messageForm.getAttachmentFile());
-				//only allow one attachment, so replace whatever
-				Set attSet = attSet = new HashSet();
-				attSet.add(att);
-				newMsg.setHasAttachment(true);
-				newMsg.getMessage().setAttachments(attSet);
-			}else if(!messageForm.isHasAttachment()){
-				Set att = newMsg.getMessage().getAttachments();
-				if(att != null && att.size() > 0){
-					List delTopicAtt = getTopicDeletedAttachmentList(sessionMap);
-					delTopicAtt.add(att.iterator().next());
-				}
-				newMsg.setHasAttachment(false);
-				newMsg.getMessage().setAttachments(null);
-			}
+	    HttpServletResponse response) throws PersistenceException {
+	MessageForm messageForm = (MessageForm) form;
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(messageForm.getSessionMapID());
+	request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, messageForm.getSessionMapID());
+
+	// get value from HttpSession
+	List topics = getTopicList(sessionMap);
+	// get param from HttpServletRequest
+	String topicIndex = request.getParameter(ForumConstants.AUTHORING_TOPICS_INDEX);
+	int topicIdx = NumberUtils.stringToInt(topicIndex, -1);
+
+	if (topicIdx != -1) {
+	    Message message = messageForm.getMessage();
+
+	    MessageDTO newMsg = (MessageDTO) topics.get(topicIdx);
+	    if (newMsg.getMessage() == null) {
+		newMsg.setMessage(new Message());
+	    }
+
+	    newMsg.getMessage().setSubject(message.getSubject());
+	    newMsg.getMessage().setBody(message.getBody());
+	    newMsg.getMessage().setUpdated(new Date());
+	    // update attachment
+	    if (messageForm.getAttachmentFile() != null
+		    && !StringUtils.isEmpty(messageForm.getAttachmentFile().getFileName())) {
+		forumService = getForumManager();
+		Attachment att = forumService.uploadAttachment(messageForm.getAttachmentFile());
+		// only allow one attachment, so replace whatever
+		Set attSet = attSet = new HashSet();
+		attSet.add(att);
+		newMsg.setHasAttachment(true);
+		newMsg.getMessage().setAttachments(attSet);
+	    } else if (!messageForm.isHasAttachment()) {
+		Set att = newMsg.getMessage().getAttachments();
+		if (att != null && att.size() > 0) {
+		    List delTopicAtt = getTopicDeletedAttachmentList(sessionMap);
+		    delTopicAtt.add(att.iterator().next());
 		}
-		
-		request.setAttribute(ForumConstants.AUTHORING_TOPICS_INDEX,topicIndex);
-		return mapping.findForward("success");
+		newMsg.setHasAttachment(false);
+		newMsg.getMessage().setAttachments(null);
+	    }
+	}
+
+	request.setAttribute(ForumConstants.AUTHORING_TOPICS_INDEX, topicIndex);
+	return mapping.findForward("success");
     }
-	/**
-	 * Remove message attachment.
-	 * 
-	 * @param mapping
-	 * @param form
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	private ActionForward deleteAttachment(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-		request.setAttribute("itemAttachment", null);
-    	return mapping.findForward("success");
+
+    /**
+     * Remove message attachment.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward deleteAttachment(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	request.setAttribute("itemAttachment", null);
+	return mapping.findForward("success");
     }
 
-	//******************************************************************************************************************
-	//              Private method for internal functions
-	//******************************************************************************************************************
-  	private IForumService getForumManager() {
-  	    if ( forumService == null ) {
-  	      WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
-  	      forumService = (IForumService) wac.getBean(ForumConstants.FORUM_SERVICE);
-  	    }
-  	    return forumService;
-  	}
-	/**
-	 * @param request
-	 * @return
-	 */
-	private List getAttachmentList(SessionMap sessionMap) {
-		return getListFromSession(sessionMap,ForumConstants.ATTACHMENT_LIST);
+    // ******************************************************************************************************************
+    // Private method for internal functions
+    // ******************************************************************************************************************
+    private IForumService getForumManager() {
+	if (forumService == null) {
+	    WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
+		    .getServletContext());
+	    forumService = (IForumService) wac.getBean(ForumConstants.FORUM_SERVICE);
 	}
-	/**
-	 * @param request
-	 * @return
-	 */
-	private List getDeletedAttachmentList(SessionMap sessionMap) {
-		return getListFromSession(sessionMap,ForumConstants.DELETED_ATTACHMENT_LIST);
+	return forumService;
+    }
+
+    /**
+     * @param request
+     * @return
+     */
+    private List getAttachmentList(SessionMap sessionMap) {
+	return getListFromSession(sessionMap, ForumConstants.ATTACHMENT_LIST);
+    }
+
+    /**
+     * @param request
+     * @return
+     */
+    private List getDeletedAttachmentList(SessionMap sessionMap) {
+	return getListFromSession(sessionMap, ForumConstants.DELETED_ATTACHMENT_LIST);
+    }
+
+    /**
+     * @param request
+     * @return
+     */
+    private List getTopicList(SessionMap sessionMap) {
+	return getListFromSession(sessionMap, ForumConstants.AUTHORING_TOPICS_LIST);
+    }
+
+    /**
+     * @param request
+     * @return
+     */
+    private List getTopicDeletedAttachmentList(SessionMap sessionMap) {
+	return getListFromSession(sessionMap, ForumConstants.DELETED_ATTACHMENT_LIST);
+    }
+
+    /**
+     * @param request
+     * @return
+     */
+    private List getDeletedTopicList(SessionMap sessionMap) {
+	return getListFromSession(sessionMap, ForumConstants.DELETED_AUTHORING_TOPICS_LIST);
+    }
+
+    /**
+     * Get <code>java.util.List</code> from HttpSession by given name.
+     * 
+     * @param request
+     * @param name
+     * @return
+     */
+    private List getListFromSession(SessionMap sessionMap, String name) {
+	List list = (List) sessionMap.get(name);
+	if (list == null) {
+	    list = new ArrayList();
+	    sessionMap.put(name, list);
 	}
-	/**
-	 * @param request
-	 * @return
-	 */
-	private List getTopicList(SessionMap sessionMap) {
-		return getListFromSession(sessionMap,ForumConstants.AUTHORING_TOPICS_LIST);
+	return list;
+    }
+
+    /**
+     * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode.
+     * 
+     * @param request
+     * @return
+     */
+    private ToolAccessMode getAccessMode(HttpServletRequest request) {
+	ToolAccessMode mode;
+	String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
+	if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) {
+	    mode = ToolAccessMode.TEACHER;
+	} else {
+	    mode = ToolAccessMode.AUTHOR;
 	}
-	/**
-	 * @param request
-	 * @return
-	 */
-	private List getTopicDeletedAttachmentList(SessionMap sessionMap) {
-		return getListFromSession(sessionMap,ForumConstants.DELETED_ATTACHMENT_LIST);
-	}
-	/**
-	 * @param request
-	 * @return
-	 */
-	private List getDeletedTopicList(SessionMap sessionMap) {
-		return getListFromSession(sessionMap,ForumConstants.DELETED_AUTHORING_TOPICS_LIST);
-	}
-	/**
-	 * Get <code>java.util.List</code> from HttpSession by given name.
-	 * 
-	 * @param request
-	 * @param name
-	 * @return
-	 */
-	private List getListFromSession(SessionMap sessionMap,String name) {
-		List list = (List) sessionMap.get(name);
-		if(list == null){
-			list = new ArrayList();
-			sessionMap.put(name,list);
-		}
-		return list;
-	}
-	
-	/**
-	 * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode.
-	 * @param request
-	 * @return
-	 */
-	private ToolAccessMode getAccessMode(HttpServletRequest request) {
-		ToolAccessMode mode;
-		String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
-		if(StringUtils.equalsIgnoreCase(modeStr,ToolAccessMode.TEACHER.toString()))
-			mode = ToolAccessMode.TEACHER;
-		else
-			mode = ToolAccessMode.AUTHOR;
-		return mode;
-	}
-	
-	  /**
+	return mode;
+    }
+
+    /**
      * Forum validation method from STRUCT interface.
      * 
      */
-    public ActionMessages validate( ForumForm form,ActionMapping mapping, javax.servlet.http.HttpServletRequest request) {
-    	ActionMessages errors = new ActionMessages();
-    	
-    	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(form.getSessionMapID());
-		ActionMessage ae;
-		try {
-			String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
-//			if (StringUtils.isBlank(form.getForum().getTitle())) {
-//				ActionMessage error = new ActionMessage("error.title.empty");
-//				errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-//			}
-			boolean allowNewTopic = form.getForum().isAllowNewTopic();
-//			define it later mode(TEACHER): need read out AllowNewTopic flag rather than get from HTML form
-			//becuase defineLater does not include this field
-			if(StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())){
-				forumService = getForumManager();
-				Forum forumPO = forumService.getForumByContentId(form.getToolContentID());
-				if(forumPO != null)
-					allowNewTopic = forumPO.isAllowNewTopic();
-				else{
-					//failure tolerance
-					log.error("ERROR: Can not found Forum by toolContentID:"+ form.getToolContentID());
-					allowNewTopic = true;
-				}
-			}
-			if(!allowNewTopic){
-				List topics = getTopicList(sessionMap);
-				if(topics.size() == 0){
-					ActionMessage error = new ActionMessage("error.must.have.topic");
-					errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-				}
-			}
-			//define it later mode(TEACHER) skip below validation.
-			if(StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())){
-				return errors;
-			}
-			if(!form.getForum().isAllowRichEditor() && form.getForum().isLimitedInput()){
-				if(form.getForum().getLimitedChar() <=0){
-					ActionMessage error = new ActionMessage("error.limit.char.less.zero");
-					errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-				}
-			}
-			if(!form.getForum().isAllowNewTopic()){
-				if(form.getForum().getMaximumReply() !=0 
-						&& (form.getForum().getMaximumReply() < form.getForum().getMinimumReply())){
-					ActionMessage error = new ActionMessage("error.min.less.max");
-					errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-				}
-			}
-			
-		} catch (Exception e) {
-			log.error(e.toString());
+    public ActionMessages validate(ForumForm form, ActionMapping mapping, javax.servlet.http.HttpServletRequest request) {
+	ActionMessages errors = new ActionMessages();
+
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(form.getSessionMapID());
+	ActionMessage ae;
+	try {
+	    String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
+	    // if (StringUtils.isBlank(form.getForum().getTitle())) {
+	    // ActionMessage error = new ActionMessage("error.title.empty");
+	    // errors.add(ActionMessages.GLOBAL_MESSAGE, error);
+	    // }
+	    boolean allowNewTopic = form.getForum().isAllowNewTopic();
+	    // define it later mode(TEACHER): need read out AllowNewTopic flag rather than get from HTML form
+	    // becuase defineLater does not include this field
+	    if (StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())) {
+		forumService = getForumManager();
+		Forum forumPO = forumService.getForumByContentId(form.getToolContentID());
+		if (forumPO != null) {
+		    allowNewTopic = forumPO.isAllowNewTopic();
+		} else {
+		    // failure tolerance
+		    AuthoringAction.log.error("ERROR: Can not found Forum by toolContentID:" + form.getToolContentID());
+		    allowNewTopic = true;
 		}
+	    }
+	    if (!allowNewTopic) {
+		List topics = getTopicList(sessionMap);
+		if (topics.size() == 0) {
+		    ActionMessage error = new ActionMessage("error.must.have.topic");
+		    errors.add(ActionMessages.GLOBAL_MESSAGE, error);
+		}
+	    }
+	    // define it later mode(TEACHER) skip below validation.
+	    if (StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())) {
 		return errors;
+	    }
+	    if (!form.getForum().isAllowRichEditor() && form.getForum().isLimitedInput()) {
+		if (form.getForum().getLimitedChar() <= 0) {
+		    ActionMessage error = new ActionMessage("error.limit.char.less.zero");
+		    errors.add(ActionMessages.GLOBAL_MESSAGE, error);
+		}
+	    }
+	    if (!form.getForum().isAllowNewTopic()) {
+		if (form.getForum().getMaximumReply() != 0
+			&& form.getForum().getMaximumReply() < form.getForum().getMinimumReply()) {
+		    ActionMessage error = new ActionMessage("error.min.less.max");
+		    errors.add(ActionMessages.GLOBAL_MESSAGE, error);
+		}
+	    }
+
+	} catch (Exception e) {
+	    AuthoringAction.log.error(e.toString());
 	}
-    private float convertToMeg( int numBytes ) {
-        return numBytes != 0 ? numBytes / 1024 / 1024 : 0;
+	return errors;
     }
-    
 
+    private float convertToMeg(int numBytes) {
+	return numBytes != 0 ? numBytes / 1024 / 1024 : 0;
+    }
+
+    /**
+     * List containing Forum conditions.
+     * 
+     * @param request
+     * @return
+     */
+    private SortedSet<ForumCondition> getForumConditionSet(SessionMap sessionMap) {
+	SortedSet<ForumCondition> list = (SortedSet<ForumCondition>) sessionMap.get(ForumConstants.ATTR_CONDITION_SET);
+	if (list == null) {
+	    list = new TreeSet<ForumCondition>(new TextSearchConditionComparator());
+	    sessionMap.put(ForumConstants.ATTR_CONDITION_SET, list);
+	}
+	return list;
+    }
+
+    /**
+     * Get the deleted condition list, which could be persisted or non-persisted items.
+     * 
+     * @param request
+     * @return
+     */
+    private List getDeletedForumConditionList(SessionMap sessionMap) {
+	return getListFromSession(sessionMap, ForumConstants.ATTR_DELETED_CONDITION_LIST);
+    }
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringConditionAction.java
===================================================================
diff -u
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringConditionAction.java	(revision 0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringConditionAction.java	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -0,0 +1,471 @@
+/**************************************************************** 
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) 
+ * ============================================================= 
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/ 
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation. 
+ * 
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA 
+ * 
+ * http://www.gnu.org/licenses/gpl.txt 
+ * **************************************************************** 
+ */
+
+/* $$Id$$ */
+package org.lamsfoundation.lams.tool.forum.web.actions;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionErrors;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.apache.struts.util.LabelValueBean;
+import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
+import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
+import org.lamsfoundation.lams.tool.forum.persistence.ForumCondition;
+import org.lamsfoundation.lams.tool.forum.persistence.Message;
+import org.lamsfoundation.lams.tool.forum.service.IForumService;
+import org.lamsfoundation.lams.tool.forum.util.ConditionTopicComparator;
+import org.lamsfoundation.lams.tool.forum.util.ForumConstants;
+import org.lamsfoundation.lams.tool.forum.web.forms.ForumConditionForm;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.util.SessionMap;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ * Auxiliary action in author mode. It contains operations with ForumCondition. The rest of operations are located in
+ * <code>AuthoringAction</code> action.
+ * 
+ * @author Marcin Cieslak
+ * @see org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction
+ */
+public class AuthoringConditionAction extends Action {
+
+    @Override
+    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws Exception {
+
+	String param = mapping.getParameter();
+
+	if (param.equals("newConditionInit")) {
+	    return newConditionInit(mapping, form, request, response);
+	}
+	if (param.equals("editCondition")) {
+	    return editCondition(mapping, form, request, response);
+	}
+	if (param.equals("saveOrUpdateCondition")) {
+	    return saveOrUpdateCondition(mapping, form, request, response);
+	}
+	if (param.equals("removeCondition")) {
+	    return removeCondition(mapping, form, request, response);
+	}
+	if (param.equals("upCondition")) {
+	    return upCondition(mapping, form, request, response);
+	}
+	if (param.equals("downCondition")) {
+	    return downCondition(mapping, form, request, response);
+	}
+	return null;
+    }
+
+    /**
+     * Display empty page for a new condition.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward newConditionInit(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+
+	populateFormWithPossibleItems(form, request);
+	((ForumConditionForm) form).setOrderId(-1);
+	return mapping.findForward("addcondition");
+    }
+
+    /**
+     * Display edit page for an existing condition.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward editCondition(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+
+	ForumConditionForm ForumConditionForm = (ForumConditionForm) form;
+	String sessionMapID = ForumConditionForm.getSessionMapID();
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+
+	int orderId = NumberUtils.stringToInt(request.getParameter(ForumConstants.PARAM_ORDER_ID), -1);
+	ForumCondition condition = null;
+	if (orderId != -1) {
+	    SortedSet<ForumCondition> conditionSet = getForumConditionSet(sessionMap);
+	    List<ForumCondition> conditionList = new ArrayList<ForumCondition>(conditionSet);
+	    condition = conditionList.get(orderId);
+	    if (condition != null) {
+		populateConditionToForm(orderId, condition, ForumConditionForm, request);
+	    }
+	}
+
+	populateFormWithPossibleItems(form, request);
+	return condition == null ? null : mapping.findForward("addcondition");
+    }
+
+    /**
+     * This method will get necessary information from condition form and save or update into <code>HttpSession</code>
+     * condition list. Notice, this save is not persist them into database, just save <code>HttpSession</code>
+     * temporarily. Only they will be persist when the entire authoring page is being persisted.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws ServletException
+     */
+    private ActionForward saveOrUpdateCondition(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+
+	ForumConditionForm conditionForm = (ForumConditionForm) form;
+	ActionErrors errors = validateForumCondition(conditionForm, request);
+
+	if (!errors.isEmpty()) {
+	    populateFormWithPossibleItems(form, request);
+	    this.addErrors(request, errors);
+	    return mapping.findForward("addcondition");
+	}
+
+	try {
+	    extractFormToForumCondition(request, conditionForm);
+	} catch (Exception e) {
+
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.condition", e.getMessage()));
+	    if (!errors.isEmpty()) {
+		populateFormWithPossibleItems(form, request);
+		this.addErrors(request, errors);
+		return mapping.findForward("addcondition");
+	    }
+	}
+
+	request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, conditionForm.getSessionMapID());
+
+	return mapping.findForward(ForumConstants.SUCCESS);
+    }
+
+    /**
+     * Remove condition from HttpSession list and update page display. As authoring rule, all persist only happen when
+     * user submit whole page. So this remove is just impact HttpSession values.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward removeCondition(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+
+	// get back sessionMAP
+	String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+
+	int orderId = NumberUtils.stringToInt(request.getParameter(ForumConstants.PARAM_ORDER_ID), -1);
+	if (orderId != -1) {
+	    SortedSet<ForumCondition> conditionSet = getForumConditionSet(sessionMap);
+	    List<ForumCondition> conditionList = new ArrayList<ForumCondition>(conditionSet);
+	    ForumCondition condition = conditionList.remove(orderId);
+
+	    for (ForumCondition otherCondition : conditionSet) {
+		if (otherCondition.getOrderId() > orderId) {
+		    otherCondition.setOrderId(otherCondition.getOrderId() - 1);
+		}
+	    }
+	    conditionSet.clear();
+	    conditionSet.addAll(conditionList);
+	    // add to delList
+	    List deletedList = getDeletedForumConditionList(sessionMap);
+	    deletedList.add(condition);
+	}
+
+	request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	return mapping.findForward(ForumConstants.SUCCESS);
+    }
+
+    /**
+     * Move up current item.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward upCondition(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	return switchItem(mapping, request, true);
+    }
+
+    /**
+     * Move down current item.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward downCondition(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	return switchItem(mapping, request, false);
+    }
+
+    private ActionForward switchItem(ActionMapping mapping, HttpServletRequest request, boolean up) {
+	// get back sessionMAP
+	String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+
+	int orderId = NumberUtils.stringToInt(request.getParameter(ForumConstants.PARAM_ORDER_ID), -1);
+	if (orderId != -1) {
+	    SortedSet<ForumCondition> conditionSet = getForumConditionSet(sessionMap);
+	    List<ForumCondition> conditionList = new ArrayList<ForumCondition>(conditionSet);
+	    // get current and the target item, and switch their sequnece
+	    ForumCondition condition = conditionList.get(orderId);
+	    ForumCondition repCondition;
+	    if (up) {
+		repCondition = conditionList.get(--orderId);
+	    } else {
+		repCondition = conditionList.get(++orderId);
+	    }
+	    int upSeqId = repCondition.getOrderId();
+	    repCondition.setOrderId(condition.getOrderId());
+	    condition.setOrderId(upSeqId);
+
+	    // put back list, it will be sorted again
+	    conditionSet.clear();
+	    conditionSet.addAll(conditionList);
+	}
+
+	request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	return mapping.findForward(ForumConstants.SUCCESS);
+    }
+
+    // *************************************************************************************
+    // Private methods for internal needs
+    // *************************************************************************************
+    /**
+     * Return ForumService bean.
+     */
+    private IForumService getForumService() {
+	WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
+		.getServletContext());
+	return (IForumService) wac.getBean(ForumConstants.FORUM_SERVICE);
+    }
+
+    /**
+     * List containing Forum conditions.
+     * 
+     * @param request
+     * @return
+     */
+    private SortedSet<ForumCondition> getForumConditionSet(SessionMap sessionMap) {
+	SortedSet<ForumCondition> list = (SortedSet<ForumCondition>) sessionMap.get(ForumConstants.ATTR_CONDITION_SET);
+	if (list == null) {
+	    list = new TreeSet<ForumCondition>(new TextSearchConditionComparator());
+	    sessionMap.put(ForumConstants.ATTR_CONDITION_SET, list);
+	}
+	return list;
+    }
+
+    private List<MessageDTO> getMessageDTOList(SessionMap sessionMap) {
+	return getListFromSession(sessionMap, ForumConstants.AUTHORING_TOPICS_LIST);
+    }
+
+    /**
+     * Get the deleted condition list, which could be persisted or non-persisted items.
+     * 
+     * @param request
+     * @return
+     */
+    private List getDeletedForumConditionList(SessionMap sessionMap) {
+	return getListFromSession(sessionMap, ForumConstants.ATTR_DELETED_CONDITION_LIST);
+    }
+
+    /**
+     * Get <code>java.util.List</code> from HttpSession by given name.
+     * 
+     * @param request
+     * @param name
+     * @return
+     */
+    private List getListFromSession(SessionMap sessionMap, String name) {
+	List list = (List) sessionMap.get(name);
+	if (list == null) {
+	    list = new ArrayList();
+	    sessionMap.put(name, list);
+	}
+	return list;
+    }
+
+    /**
+     * This method will populate condition information to its form for edit use.
+     * 
+     * @param orderId
+     * @param condition
+     * @param form
+     * @param request
+     */
+    private void populateConditionToForm(int orderId, ForumCondition condition, ForumConditionForm form,
+	    HttpServletRequest request) {
+	form.populateForm(condition);
+	if (orderId >= 0) {
+	    form.setOrderId(orderId + 1);
+	}
+    }
+
+    /**
+     * This method will populate questions to choose to the form for edit use.
+     * 
+     * @param sequenceId
+     * @param condition
+     * @param form
+     * @param request
+     */
+    private void populateFormWithPossibleItems(ActionForm form, HttpServletRequest request) {
+	ForumConditionForm conditionForm = (ForumConditionForm) form;
+	// get back sessionMAP
+	String sessionMapID = conditionForm.getSessionMapID();
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+
+	List<MessageDTO> messageDTOs = getMessageDTOList(sessionMap);
+
+	// Initialise the LabelValueBeans in the possibleOptions array.
+
+	List<LabelValueBean> lvBeans = new LinkedList<LabelValueBean>();
+
+	for (MessageDTO messageDTO : messageDTOs) {
+	    Message topic = messageDTO.getMessage();
+	    lvBeans.add(new LabelValueBean(topic.getSubject(), new Long(topic.getCreated().getTime()).toString()));
+	}
+	conditionForm.setPossibleItems(lvBeans.toArray(new LabelValueBean[] {}));
+    }
+
+    /**
+     * Extract form content to ForumCondition.
+     * 
+     * @param request
+     * @param form
+     * @throws Exception
+     */
+    private void extractFormToForumCondition(HttpServletRequest request, ForumConditionForm form) throws Exception {
+
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(form.getSessionMapID());
+	// check whether it is "edit(old item)" or "add(new item)"
+	SortedSet<ForumCondition> conditionSet = getForumConditionSet(sessionMap);
+	int orderId = form.getOrderId();
+	ForumCondition condition = null;
+
+	if (orderId == -1) { // add
+	    String properConditionName = getForumService().createTextSearchConditionName(conditionSet);
+	    condition = form.extractCondition();
+	    condition.setName(properConditionName);
+	    int maxOrderId = 1;
+	    if (conditionSet != null && conditionSet.size() > 0) {
+		ForumCondition last = conditionSet.last();
+		maxOrderId = last.getOrderId() + 1;
+	    }
+	    condition.setOrderId(maxOrderId);
+	    conditionSet.add(condition);
+	} else { // edit
+	    List<ForumCondition> conditionList = new ArrayList<ForumCondition>(conditionSet);
+	    condition = conditionList.get(orderId - 1);
+	    form.extractCondition(condition);
+	}
+
+	Long[] selectedItems = form.getSelectedItems();
+	Set<Message> conditionTopics = new TreeSet<Message>(new ConditionTopicComparator());
+	List<MessageDTO> messageDTOs = getMessageDTOList(sessionMap);
+
+	for (Long selectedItem : selectedItems) {
+	    for (MessageDTO messageDTO : messageDTOs) {
+		Message topic = messageDTO.getMessage();
+		if (selectedItem.equals(topic.getCreated().getTime())) {
+		    conditionTopics.add(topic);
+		}
+	    }
+	}
+	condition.setTopics(conditionTopics);
+    }
+
+    /**
+     * Validate ForumCondition
+     * 
+     * @param conditionForm
+     * @return
+     */
+    private ActionErrors validateForumCondition(ForumConditionForm conditionForm, HttpServletRequest request) {
+	ActionErrors errors = new ActionErrors();
+
+	String formConditionName = conditionForm.getDisplayName();
+	if (StringUtils.isBlank(formConditionName)) {
+
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.condition.name.blank"));
+	} else {
+
+	    Integer formConditionOrderId = conditionForm.getOrderId();
+
+	    String sessionMapID = conditionForm.getSessionMapID();
+	    SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	    SortedSet<ForumCondition> conditionSet = getForumConditionSet(sessionMap);
+	    for (ForumCondition condition : conditionSet) {
+		if (formConditionName.equals(condition.getDisplayName())
+			&& !formConditionOrderId.equals(condition.getOrderId())) {
+
+		    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.condition.duplicated.name"));
+		    break;
+		}
+	    }
+	}
+
+	// should be selected at least one question
+	Long[] selectedItems = conditionForm.getSelectedItems();
+	if (selectedItems == null || selectedItems.length == 0) {
+	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.condition.no.questions.selected"));
+	}
+
+	return errors;
+    }
+
+    private ActionMessages validate(ForumConditionForm form, ActionMapping mapping, HttpServletRequest request) {
+	return new ActionMessages();
+    }
+}
\ No newline at end of file
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumConditionForm.java
===================================================================
diff -u
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumConditionForm.java	(revision 0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumConditionForm.java	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -0,0 +1,117 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $$Id$$ */
+package org.lamsfoundation.lams.tool.forum.web.forms;
+
+import org.apache.struts.util.LabelValueBean;
+import org.lamsfoundation.lams.tool.forum.persistence.ForumCondition;
+import org.lamsfoundation.lams.tool.forum.persistence.Message;
+import org.lamsfoundation.lams.web.TextSearchActionForm;
+
+/**
+ * A text search form with additional parameters for Forum needs.
+ * 
+ * @struts.form name="forumConditionForm"
+ * @author Marcin Cieslak
+ * 
+ */
+public class ForumConditionForm extends TextSearchActionForm {
+    /**
+     * Names of the topics that could be selected by a user.
+     */
+    private LabelValueBean[] possibleItems;
+    /**
+     * Dates of creation of topics that were selected by a user.
+     */
+    private Long[] selectedItems;
+    private Integer orderId;
+    private String displayName;
+
+    public String getDisplayName() {
+	return displayName;
+    }
+
+    public void setDisplayName(String name) {
+	displayName = name;
+    }
+
+    public ForumConditionForm() {
+    }
+
+    public void populateForm(ForumCondition condition) {
+	super.populateForm(condition);
+	setOrderId(condition.getOrderId());
+	setDisplayName(condition.getDisplayName());
+	Long[] selectedItems = new Long[condition.getTopics().size()];
+	int questionIndex = 0;
+	for (Message topic : condition.getTopics()) {
+	    selectedItems[questionIndex] = topic.getCreated().getTime();
+	    questionIndex++;
+	}
+	setSelectedItems(selectedItems);
+    }
+
+    public LabelValueBean[] getPossibleItems() {
+	return possibleItems;
+    }
+
+    public void setPossibleItems(LabelValueBean[] possibleItems) {
+	this.possibleItems = possibleItems;
+    }
+
+    public Long[] getSelectedItems() {
+	return selectedItems;
+    }
+
+    public void setSelectedItems(Long[] selectedItems) {
+	this.selectedItems = selectedItems;
+    }
+
+    public Integer getOrderId() {
+	return orderId;
+    }
+
+    public void setOrderId(Integer orderId) {
+	this.orderId = orderId;
+    }
+
+    /**
+     * Fills a new ForumCondition with data contained in this form. Note that some cruicial data is missing, so the
+     * condition is NOT complete.
+     * 
+     * @return created condition
+     */
+    public ForumCondition extractCondition() {
+	return new ForumCondition(null, null, getOrderId(), null, getDisplayName(), getAllWords(), getPhrase(),
+		getAnyWords(), getExcludedWords(), null);
+    }
+
+    public void extractCondition(ForumCondition condition) {
+	condition.setOrderId(getOrderId());
+	condition.setDisplayName(getDisplayName());
+	condition.setAllWords(getAllWords());
+	condition.setPhrase(getPhrase());
+	condition.setAnyWords(getAnyWords());
+	condition.setExcludedWords(getExcludedWords());
+    }
+}
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/lams.tld
===================================================================
diff -u -rc5b655c3c11fa9d9b1d76e0ef602acf6363e45f9 -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224
--- lams_tool_forum/web/WEB-INF/lams.tld	(.../lams.tld)	(revision c5b655c3c11fa9d9b1d76e0ef602acf6363e45f9)
+++ lams_tool_forum/web/WEB-INF/lams.tld	(.../lams.tld)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -466,6 +466,10 @@
    	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
+   	</tag-file>
+   	<tag-file>
+	    <name>TextSearch</name>
+		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -ra01292ae06e058ffcc16aaeec6d61959a7b69273 -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -18,17 +18,21 @@
       type="org.lamsfoundation.lams.tool.forum.web.forms.ForumForm"
     />
     <form-bean
+      name="forumConditionForm"
+      type="org.lamsfoundation.lams.tool.forum.web.forms.ForumConditionForm"
+    />
+    <form-bean
       name="markForm"
       type="org.lamsfoundation.lams.tool.forum.web.forms.MarkForm"
     />
     <form-bean
-      name="reflectionForm"
-      type="org.lamsfoundation.lams.tool.forum.web.forms.ReflectionForm"
-    />
-    <form-bean
       name="messageForm"
       type="org.lamsfoundation.lams.tool.forum.web.forms.MessageForm"
     />
+    <form-bean
+      name="reflectionForm"
+      type="org.lamsfoundation.lams.tool.forum.web.forms.ReflectionForm"
+    />
 
    <form-bean name="emptyForm" type="org.apache.struts.action.DynaActionForm" />
 
@@ -167,6 +171,47 @@
 			<forward name="success" path="/jsps/authoring/message/topiclist.jsp" />
 		</action>
 
+		<!-- ==========  Survey Conditions  ========== -->
+		<action path="/authoring/newConditionInit"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringConditionAction"
+			name="forumConditionForm" 
+			scope="request" 
+			validate="false"			
+			parameter="newConditionInit">
+			<forward name="addcondition" path="/jsps/authoring/addCondition.jsp" />
+		</action>
+		<action path="/authoring/editCondition"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringConditionAction"
+			name="forumConditionForm" 
+			scope="request" 
+			parameter="editCondition" 
+			validate="false">
+			<forward name="addcondition" path="/jsps/authoring/addCondition.jsp" />
+		</action>
+		<action path="/authoring/saveOrUpdateCondition"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringConditionAction"
+			parameter="saveOrUpdateCondition"
+			name="forumConditionForm" 
+			scope="request" 
+			validate="false">
+			<forward name="addcondition" path="/jsps/authoring/addCondition.jsp" />
+			<forward name="success" path="/jsps/authoring/conditionList.jsp" />
+		</action>
+		<action path="/authoring/removeCondition"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringConditionAction"
+			parameter="removeCondition">
+			<forward name="success" path="/jsps/authoring/conditionList.jsp" />
+		</action>
+		<action path="/authoring/upCondition"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringConditionAction"
+			parameter="upCondition">
+			<forward name="success" path="/jsps/authoring/conditionList.jsp" />
+		</action>
+		<action path="/authoring/downCondition"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringConditionAction"
+			parameter="downCondition">
+			<forward name="success" path="/jsps/authoring/conditionList.jsp" />
+		</action>
 		<!-- ========== END: Authroing Definitions ============================== -->
 		<!-- ========== BEGIN: Learning Definitions ============================== -->
 		<action path="/learning/viewForum"
Index: lams_tool_forum/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u
--- lams_tool_forum/web/WEB-INF/tags/TextSearch.tag	(revision 0)
+++ lams_tool_forum/web/WEB-INF/tags/TextSearch.tag	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -0,0 +1,136 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * TextSearch.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays form for creating text search conditions.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%-- Required attributes --%>
+<%@ attribute name="sessionMapID" required="true" rtexprvalue="true" %>
+<%@ attribute name="wrapInFormTag" required="true" rtexprvalue="true" %>
+
+<%-- Optional attributes --%>
+<%@ attribute name="action" required="false" rtexprvalue="true" %>
+<%@ attribute name="formID" required="false" rtexprvalue="true" %>
+<%@ attribute name="headingLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="allWordsLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="phraseLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="anyWordsLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="excludedWordsLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="saveButtonLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="cancelButtonLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="cancelAction" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty action}">
+	<c:set var="action" value="authoring/textsearch.do" scope="request"/>
+</c:if>
+<c:if test="${empty cancelAction}">
+	<c:set var="cancelAction" value="authoring/textsearchCancel.do" scope="request"/>
+</c:if>
+<c:if test="${empty formID}">
+	<c:set var="formID" value="textSearchForm" scope="request"/>
+</c:if>
+<c:if test="${empty headingFindTextLabelKey}">
+	<c:set var="headingLabelKey" value="textsearch.heading" scope="request"/>
+</c:if>
+<c:if test="${empty allWordsLabelKey}">
+	<c:set var="allWordsLabelKey" value="textsearch.all.words" scope="request"/>
+</c:if>
+<c:if test="${empty phraseLabelKey}">
+	<c:set var="phraseLabelKey" value="textsearch.phrase" scope="request"/>
+</c:if>
+<c:if test="${empty anyWordsLabelKey}">
+	<c:set var="anyWordsLabelKey" value="textsearch.any.words" scope="request"/>
+</c:if>
+<c:if test="${empty excludedWordsLabelKey}">
+	<c:set var="excludedWordsLabelKey" value="textsearch.excluded.words" scope="request"/>
+</c:if>
+<c:if test="${empty saveButtonLabelKey}">
+	<c:set var="saveButtonLabelKey" value="textsearch.save" scope="request"/>
+</c:if>
+<c:if test="${empty cancelButtonLabelKey}">
+	<c:set var="cancelButtonLabelKey" value="textsearch.cancel" scope="request"/>
+</c:if>
+
+<!-- begin text search form content -->
+	
+<c:if test="${wrapInFormTag}">
+	<form action="${action}" id="${formID}" name="${formID}">
+</c:if>
+		<html:hidden property="sessionMapID" />
+		<h4><fmt:message key="${headingLabelKey}" /></h4>
+		<table>
+			<tr>
+				<td>
+					<fmt:message key="${allWordsLabelKey}" />
+				</td>
+				<td>
+					<html:text size="40" property="allWords" />
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<fmt:message key="${phraseLabelKey}" />
+				</td>
+				<td>
+					<html:text size="40" property="phrase" />
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<fmt:message key="${anyWordsLabelKey}" />
+				</td>
+				<td>
+					<html:text size="40" property="anyWords" /> 
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<fmt:message key="${excludedWordsLabelKey}" />
+				</td>
+				<td>
+					<html:text size="40" property="excludedWords" /> 
+				</td>
+			</tr>
+		</table>
+<c:if test="${wrapInFormTag}">
+	<lams:ImgButtonWrapper>
+		<a href="#" onclick="${formID}.submit();" class="button-add-item"><fmt:message key="${saveButtonLabelKey}" />
+		</a>
+		<a href="#" onclick="location.href='${cancelAction}'" class="button space-left"><fmt:message key="${cancelButtonLabelKey}" />
+		</a>
+	</lams:ImgButtonWrapper>
+	</form>
+</c:if>
+<!-- end text search form content -->
\ No newline at end of file
Index: lams_tool_forum/web/images/downarrow.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_forum/web/images/downarrow_disabled.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_forum/web/images/uparrow.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_forum/web/images/uparrow_disabled.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_forum/web/jsps/authoring/addCondition.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/authoring/addCondition.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/authoring/addCondition.jsp	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
+		"http://www.w3.org/TR/html4/loose.dtd">
+<%@ include file="/common/taglibs.jsp"%>
+
+<lams:html>
+	<lams:head>
+		<%@ include file="/common/header.jsp"%>
+		<lams:css style="tabbed" />
+
+	</lams:head>
+	<body class="tabpart">
+		<!-- Basic Info Form-->
+		<%@ include file="/common/messages.jsp"%>
+		<html:form action="/authoring/saveOrUpdateCondition" method="post" styleId="forumConditionForm" focus="displayName" >
+			<html:hidden property="orderId" />
+			<h2 class="no-space-left">
+				<fmt:message key="label.authoring.conditions.add.condition" />
+			</h2>
+
+			<div class="field-name">
+            	<fmt:message key="label.authoring.conditions.condition.name" />
+			</div>
+
+			<div class="small-space-bottom">
+         		<html:text property="displayName" size="51"/>
+			</div>
+			<%-- Text search form fields are being included --%>
+			<lams:TextSearch wrapInFormTag="false" sessionMapID="${sessionMapID}"  />
+			<h4 class="no-space-left"><fmt:message key="textsearch.topics" /></h4>
+			<logic:iterate name="forumConditionForm" id="itemE" property="possibleItems">
+			  	<html:multibox property="selectedItems">
+			    	<bean:write name="itemE" property="value" />
+			  	</html:multibox>
+			    <bean:write name="itemE" property="label" />
+			    <br />
+			</logic:iterate>
+
+		</html:form>
+
+		<lams:ImgButtonWrapper>
+			<a href="#" onclick="forumConditionForm.submit();" class="button-add-item"><fmt:message
+					key="label.save" /> </a>
+			<a href="#" onclick="window.top.hideConditionMessage();"
+				class="button space-left"><fmt:message key="button.cancel" /> </a>
+		</lams:ImgButtonWrapper>
+	</body>
+</lams:html>
Index: lams_tool_forum/web/jsps/authoring/authoring.jsp
===================================================================
diff -u -r1c995cd6d87591d824ddde103a6138f2632e8f71 -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224
--- lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1c995cd6d87591d824ddde103a6138f2632e8f71)
+++ lams_tool_forum/web/jsps/authoring/authoring.jsp	(.../authoring.jsp)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -18,6 +18,7 @@
 			<lams:Tab id="1" key="authoring.tab.basic" />
 			<lams:Tab id="2" key="authoring.tab.advanced" />
 			<lams:Tab id="3" key="authoring.tab.instructions" />
+			<lams:Tab id="4" key="authoring.tab.conditions" />
 		</lams:Tabs>
 	</div>
 	<div id="content">
@@ -31,6 +32,8 @@
 			page="advance.jsp" />
 		<lams:TabBody id="3" titleKey="authoring.tab.instructions"
 			page="instructions.jsp" />
+		<lams:TabBody id="4" titleKey="authoring.tab.conditions"
+			page="conditions.jsp" />
 		<!-- Button Row -->
 		<lams:AuthoringButton formID="authoringForm"
 			clearSessionActionUrl="/clearsession.do"
Index: lams_tool_forum/web/jsps/authoring/conditionList.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/authoring/conditionList.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/authoring/conditionList.jsp	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -0,0 +1,88 @@
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+
+
+<div id="conditionList">
+	<h2 class="spacer-left">
+		<fmt:message key="label.authoring.conditions.list.title" />
+		<img src="<html:rewrite page='/images/indicator.gif' />" style="display:none" id="conditionListArea_Busy" />
+	</h2>
+	
+	<table class="alternative-color" id="conditionTable" cellspacing="0">
+		<tr>
+			<th width="14%" align="left">
+				<fmt:message key="label.authoring.conditions.order" />
+			</th>
+			<th align="left" colspan="4">
+				<fmt:message key="label.authoring.conditions.condition.name" />
+			</th>
+		</tr>
+
+		<c:if test="${empty sessionMap.conditionList}">
+			<tr>
+                <td colspan="5">
+					<fmt:message key="label.authoring.conditions.empty.condition.list" />
+				</td>
+			</tr>
+		</c:if>
+
+		<c:forEach var="condition" items="${sessionMap.conditionList}" varStatus="status">
+			<tr>
+                <td>
+					${status.index + 1}
+				</td>
+			
+                <td>
+					${condition.displayName}
+				</td>
+
+				<td width="40px" align="center">
+					<c:if test="${not status.first}">
+						<img src="<html:rewrite page='/images/uparrow.gif' />"
+							border="0" title="<fmt:message key="label.authoring.up"/>"
+							onclick="upCondition(${status.index},'${sessionMapID}')">
+						<c:if test="${status.last}">
+							<img
+								src="<html:rewrite page='/images/downarrow_disabled.gif' />"
+								border="0" title="<fmt:message key="label.authoring.down"/>">
+						</c:if>
+					</c:if>
+
+					<c:if test="${not status.last}">
+						<c:if test="${status.first}">
+							<img
+								src="<html:rewrite page='/images/uparrow_disabled.gif' />"
+								border="0" title="<fmt:message key="label.authoring.up"/>">
+						</c:if>
+
+						<img src="<html:rewrite page='/images/downarrow.gif' />"
+							border="0" title="<fmt:message key="label.authoring.down"/>"
+							onclick="downCondition(${status.index},'${sessionMapID}')">
+					</c:if>
+				</td>
+				
+				<td width="20px">
+					<img src="<html:rewrite page='/images/edit.gif' />"
+						title="<fmt:message key="label.edit" />"
+						onclick="editCondition(${status.index},'${sessionMapID}')" />
+                </td>
+                
+				<td width="20px">
+					<img src="<html:rewrite page='/images/delete.gif' />"
+						title="<fmt:message key="label.delete" />"
+						onclick="deleteCondition(${status.index},'${sessionMapID}')" />
+				</td>
+			</tr>
+		</c:forEach>
+	</table>
+</div>
+
+<%-- This script will works when a new resoruce Condition submit in order to refresh "TaskList List" panel. --%>
+<script type="text/javascript">
+
+	if(window.top != null){
+		window.top.hideConditionMessage();
+		var obj = window.top.document.getElementById('conditionsArea');
+		obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	}
+</script>
Index: lams_tool_forum/web/jsps/authoring/conditions.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/authoring/conditions.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/authoring/conditions.jsp	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
@@ -0,0 +1,110 @@
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="formBean"
+	value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+<script type="text/javascript">
+<!-- Common Javascript functions for LAMS -->
+
+	/**
+	 * Launches the popup window for the instruction files
+	 */
+	function showConditionMessage(url) {
+		var area=document.getElementById("conditionInputArea");
+		if(area != null){
+			area.style.width="650px";
+			area.style.height="100%";
+			area.src=url;
+			area.style.display="block";
+		}
+		var elem = document.getElementById("saveCancelButtons");
+		if (elem != null) {
+			elem.style.display="none";
+		}
+		location.hash = "conditionInputArea";
+	}
+	function hideConditionMessage(){
+		var area=document.getElementById("conditionInputArea");
+		if(area != null){
+			area.style.width="0px";
+			area.style.height="0px";
+			area.style.display="none";
+		}
+		var elem = document.getElementById("saveCancelButtons");
+		if (elem != null) {
+			elem.style.display="block";
+		}
+	}
+
+	function editCondition(orderId,sessionMapID){
+		 var reqIDVar = new Date();
+		var url = "<c:url value="/authoring/editCondition.do?orderId="/>" + orderId +"&sessionMapID="+sessionMapID;;
+		showConditionMessage(url);
+	}
+	//The panel of taskList list panel
+	var conditionListTargetDiv = "conditionsArea";
+	function deleteCondition(orderId,sessionMapID){
+		var url = "<c:url value="/authoring/removeCondition.do"/>";
+	    var reqIDVar = new Date();
+		var param = "orderId=" + orderId +"&sessionMapID="+sessionMapID;;
+	    var myAjax = new Ajax.Updater(
+		    	conditionListTargetDiv,
+		    	url,
+		    	{
+		    		method:'get',
+		    		parameters:param,
+		    		evalScripts:true
+		    	}
+	    );
+	}
+	
+	function upCondition(orderId,sessionMapID){
+		var url = "<c:url value="/authoring/upCondition.do"/>";
+	    var reqIDVar = new Date();
+		var param = "orderId=" + orderId + "&sessionMapID="+sessionMapID;;
+	    var myAjax = new Ajax.Updater(
+		    	conditionListTargetDiv,
+		    	url,
+		    	{
+		    		method:'get',
+		    		parameters:param,
+		    		evalScripts:true
+		    	}
+	    );
+	}
+	function downCondition(orderId,sessionMapID){
+		var url = "<c:url value="/authoring/downCondition.do"/>";
+	    var reqIDVar = new Date();
+		var param = "orderId=" + orderId + "&sessionMapID="+sessionMapID;;
+	    var myAjax = new Ajax.Updater(
+		    	conditionListTargetDiv,
+		    	url,
+		    	{
+		    		method:'get',
+		    		parameters:param,
+		    		evalScripts:true
+		    	}
+	    );
+	}
+
+</script>
+
+<!-- Conditions Tab Content -->
+
+<div id="conditionsArea">
+	<c:set var="sessionMapID" value="${formBean.sessionMapID}" />
+	<%@ include file="/jsps/authoring/conditionList.jsp"%>
+</div>
+
+<p class="small-space-bottom">
+	<a href="javascript:showConditionMessage('<html:rewrite page="/authoring/newConditionInit.do?sessionMapID=${formBean.sessionMapID}"/>');" class="button-add-item">
+	<fmt:message key="label.authoring.conditions.add.condition" /></a> 
+</p>
+
+
+<p>
+	<iframe
+		onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
+		id="conditionInputArea" name="conditionInputArea"
+		style="width:0px;height:0px;border:0px;display:none" frameborder="no"
+		scrolling="no">
+	</iframe>
+</p>